|
404 | 404 | ////////////////////////////////////////////////////////////////////////////////
|
405 | 405 | --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
406 | 406 | +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
407 |
| -@@ -1234,15 +1234,4 @@ void BookmarkMenuDelegate::BuildOtherNod |
408 |
| - ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon( |
409 |
| - kBookmarksSidePanelIcon, ui::kColorMenuIcon, |
410 |
| - ui::SimpleMenuModel::kDefaultIconSize); |
411 |
| -- menu->AppendMenuItem( |
412 |
| -- IDC_SHOW_BOOKMARK_SIDE_PANEL, |
413 |
| -- l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL), |
| 407 | +@@ -1237,12 +1237,14 @@ void BookmarkMenuDelegate::BuildOtherNod |
| 408 | + menu->AppendMenuItem( |
| 409 | + IDC_SHOW_BOOKMARK_SIDE_PANEL, |
| 410 | + l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL), |
414 | 411 | - bookmarks_side_panel_icon);
|
415 |
| -- bool other_folder_children_count = |
416 |
| -- GetBookmarkMergedSurfaceService()->GetChildrenCount( |
417 |
| -- BookmarkParentFolder::OtherFolder()); |
418 |
| -- if (other_folder_children_count) { |
419 |
| -- menu->AppendSeparator(); |
420 |
| -- other_node_menu_separator_ = menu->GetSubmenu()->children().back().get(); |
421 |
| -- } |
| 412 | ++ bookmarks_side_panel_icon)->SetVisible(false); |
| 413 | ++ |
| 414 | + bool other_folder_children_count = |
| 415 | + GetBookmarkMergedSurfaceService()->GetChildrenCount( |
| 416 | + BookmarkParentFolder::OtherFolder()); |
| 417 | + if (other_folder_children_count) { |
| 418 | + menu->AppendSeparator(); |
| 419 | + other_node_menu_separator_ = menu->GetSubmenu()->children().back().get(); |
| 420 | ++ other_node_menu_separator_->SetVisible(false); |
| 421 | + } |
422 | 422 | }
|
423 | 423 | --- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
|
424 | 424 | +++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
|
|
0 commit comments