Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc

Issue 7744055: bookmarks: Fix an obvious typo in IDS_BOOMARK_*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/views/bookmarks/bookmark_context_menu_controller_vie ws.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_vie ws.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/bookmarks/bookmark_editor.h" 9 #include "chrome/browser/bookmarks/bookmark_editor.h"
10 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h" 10 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/prefs/incognito_mode_prefs.h" 13 #include "chrome/browser/prefs/incognito_mode_prefs.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_list.h" 17 #include "chrome/browser/ui/browser_list.h"
18 #include "content/browser/user_metrics.h"
19 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
20 #include "content/browser/tab_contents/page_navigator.h" 19 #include "content/browser/tab_contents/page_navigator.h"
20 #include "content/browser/user_metrics.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "views/widget/widget.h" 22 #include "views/widget/widget.h"
23 23
24 BookmarkContextMenuControllerViews::BookmarkContextMenuControllerViews( 24 BookmarkContextMenuControllerViews::BookmarkContextMenuControllerViews(
25 views::Widget* parent_widget, 25 views::Widget* parent_widget,
26 BookmarkContextMenuControllerViewsDelegate* delegate, 26 BookmarkContextMenuControllerViewsDelegate* delegate,
27 Profile* profile, 27 Profile* profile,
28 PageNavigator* navigator, 28 PageNavigator* navigator,
29 const BookmarkNode* parent, 29 const BookmarkNode* parent,
30 const std::vector<const BookmarkNode*>& selection) 30 const std::vector<const BookmarkNode*>& selection)
(...skipping 10 matching lines...) Expand all
41 } 41 }
42 42
43 BookmarkContextMenuControllerViews::~BookmarkContextMenuControllerViews() { 43 BookmarkContextMenuControllerViews::~BookmarkContextMenuControllerViews() {
44 if (model_) 44 if (model_)
45 model_->RemoveObserver(this); 45 model_->RemoveObserver(this);
46 } 46 }
47 47
48 void BookmarkContextMenuControllerViews::BuildMenu() { 48 void BookmarkContextMenuControllerViews::BuildMenu() {
49 if (selection_.size() == 1 && selection_[0]->is_url()) { 49 if (selection_.size() == 1 && selection_[0]->is_url()) {
50 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL, 50 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL,
51 IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB); 51 IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB);
52 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 52 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
53 IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW); 53 IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW);
54 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, 54 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
55 IDS_BOOMARK_BAR_OPEN_INCOGNITO); 55 IDS_BOOKMARK_BAR_OPEN_INCOGNITO);
56 } else { 56 } else {
57 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL, 57 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL,
58 IDS_BOOMARK_BAR_OPEN_ALL); 58 IDS_BOOKMARK_BAR_OPEN_ALL);
59 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 59 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
60 IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); 60 IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW);
61 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, 61 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
62 IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO); 62 IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO);
63 } 63 }
64 64
65 delegate_->AddSeparator(); 65 delegate_->AddSeparator();
66 if (selection_.size() == 1 && selection_[0]->is_folder()) { 66 if (selection_.size() == 1 && selection_[0]->is_folder()) {
67 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_RENAME_FOLDER, 67 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_RENAME_FOLDER,
68 IDS_BOOKMARK_BAR_RENAME_FOLDER); 68 IDS_BOOKMARK_BAR_RENAME_FOLDER);
69 } else { 69 } else {
70 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_EDIT, 70 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_EDIT,
71 IDS_BOOKMARK_BAR_EDIT); 71 IDS_BOOKMARK_BAR_EDIT);
72 } 72 }
73 73
74 delegate_->AddSeparator(); 74 delegate_->AddSeparator();
75 delegate_->AddItemWithStringId(IDC_CUT, IDS_CUT); 75 delegate_->AddItemWithStringId(IDC_CUT, IDS_CUT);
76 delegate_->AddItemWithStringId(IDC_COPY, IDS_COPY); 76 delegate_->AddItemWithStringId(IDC_COPY, IDS_COPY);
77 delegate_->AddItemWithStringId(IDC_PASTE, IDS_PASTE); 77 delegate_->AddItemWithStringId(IDC_PASTE, IDS_PASTE);
78 78
79 delegate_->AddSeparator(); 79 delegate_->AddSeparator();
80 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_REMOVE, 80 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_REMOVE,
81 IDS_BOOKMARK_BAR_REMOVE); 81 IDS_BOOKMARK_BAR_REMOVE);
82 82
83 delegate_->AddSeparator(); 83 delegate_->AddSeparator();
84 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, 84 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK,
85 IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK); 85 IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK);
86 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_NEW_FOLDER, 86 delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_NEW_FOLDER,
87 IDS_BOOMARK_BAR_NEW_FOLDER); 87 IDS_BOOKMARK_BAR_NEW_FOLDER);
88 88
89 delegate_->AddSeparator(); 89 delegate_->AddSeparator();
90 delegate_->AddItemWithStringId(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); 90 delegate_->AddItemWithStringId(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
91 delegate_->AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW, 91 delegate_->AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW,
92 IDS_SHOW_BOOKMARK_BAR); 92 IDS_SHOW_BOOKMARK_BAR);
93 } 93 }
94 94
95 void BookmarkContextMenuControllerViews::ExecuteCommand(int id) { 95 void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
96 BookmarkModel* model = RemoveModelObserver(); 96 BookmarkModel* model = RemoveModelObserver();
97 97
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 return model; 307 return model;
308 } 308 }
309 309
310 bool BookmarkContextMenuControllerViews::HasURLs() const { 310 bool BookmarkContextMenuControllerViews::HasURLs() const {
311 for (size_t i = 0; i < selection_.size(); ++i) { 311 for (size_t i = 0; i < selection_.size(); ++i) {
312 if (bookmark_utils::NodeHasURLs(selection_[i])) 312 if (bookmark_utils::NodeHasURLs(selection_[i]))
313 return true; 313 return true;
314 } 314 }
315 return false; 315 return false;
316 } 316 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698