| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" | 5 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 AddItem(IDC_BOOKMARK_BAR_REDO, IDS_BOOKMARK_BAR_REDO); | 100 AddItem(IDC_BOOKMARK_BAR_REDO, IDS_BOOKMARK_BAR_REDO); |
| 101 } | 101 } |
| 102 | 102 |
| 103 AddSeparator(); | 103 AddSeparator(); |
| 104 AddItem(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK); | 104 AddItem(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK); |
| 105 AddItem(IDC_BOOKMARK_BAR_NEW_FOLDER, IDS_BOOKMARK_BAR_NEW_FOLDER); | 105 AddItem(IDC_BOOKMARK_BAR_NEW_FOLDER, IDS_BOOKMARK_BAR_NEW_FOLDER); |
| 106 | 106 |
| 107 AddSeparator(); | 107 AddSeparator(); |
| 108 AddItem(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); | 108 AddItem(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); |
| 109 // Use the native host desktop type in tests. | 109 // Use the native host desktop type in tests. |
| 110 if (chrome::IsAppsShortcutEnabled( | 110 if (chrome::IsAppsShortcutEnabled(profile_, |
| 111 profile_, | 111 browser_ ? browser_->host_desktop_type() |
| 112 browser_ ? browser_->host_desktop_type() | 112 : ui::HOST_DESKTOP_TYPE_NATIVE)) { |
| 113 : chrome::HOST_DESKTOP_TYPE_NATIVE)) { | |
| 114 AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT, | 113 AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT, |
| 115 IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT); | 114 IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT); |
| 116 } | 115 } |
| 117 AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS, | 116 AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS, |
| 118 IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS_DEFAULT_NAME); | 117 IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS_DEFAULT_NAME); |
| 119 AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW, IDS_SHOW_BOOKMARK_BAR); | 118 AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW, IDS_SHOW_BOOKMARK_BAR); |
| 120 } | 119 } |
| 121 | 120 |
| 122 void BookmarkContextMenuController::AddItem(int id, int localization_id) { | 121 void BookmarkContextMenuController::AddItem(int id, int localization_id) { |
| 123 menu_model_->AddItemWithStringId(id, localization_id); | 122 menu_model_->AddItemWithStringId(id, localization_id); |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 bool BookmarkContextMenuController::GetAcceleratorForCommandId( | 427 bool BookmarkContextMenuController::GetAcceleratorForCommandId( |
| 429 int command_id, | 428 int command_id, |
| 430 ui::Accelerator* accelerator) { | 429 ui::Accelerator* accelerator) { |
| 431 return false; | 430 return false; |
| 432 } | 431 } |
| 433 | 432 |
| 434 void BookmarkContextMenuController::BookmarkModelChanged() { | 433 void BookmarkContextMenuController::BookmarkModelChanged() { |
| 435 if (delegate_) | 434 if (delegate_) |
| 436 delegate_->CloseMenu(); | 435 delegate_->CloseMenu(); |
| 437 } | 436 } |
| OLD | NEW |