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

Side by Side Diff: chrome/browser/ui/toolbar/media_router_contextual_menu.cc

Issue 2112623002: Replace "Remove from Chrome..." in the action context menu with "Remove icon" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address apacible@'s comment, rebase Created 4 years, 5 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
« no previous file with comments | « chrome/app/media_router_strings.grdp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/logging.h" 5 #include "base/logging.h"
6 #include "base/metrics/user_metrics.h" 6 #include "base/metrics/user_metrics.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/extensions/component_migration_helper.h" 8 #include "chrome/browser/extensions/component_migration_helper.h"
9 #include "chrome/browser/media/router/media_router_factory.h" 9 #include "chrome/browser/media/router/media_router_factory.h"
10 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h" 10 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
(...skipping 22 matching lines...) Expand all
33 : browser_(browser), 33 : browser_(browser),
34 menu_model_(this) { 34 menu_model_(this) {
35 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT, 35 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT,
36 IDS_MEDIA_ROUTER_ABOUT); 36 IDS_MEDIA_ROUTER_ABOUT);
37 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 37 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
38 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE, 38 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE,
39 IDS_MEDIA_ROUTER_LEARN_MORE); 39 IDS_MEDIA_ROUTER_LEARN_MORE);
40 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP, 40 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP,
41 IDS_MEDIA_ROUTER_HELP); 41 IDS_MEDIA_ROUTER_HELP);
42 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION, 42 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION,
43 IDS_EXTENSIONS_UNINSTALL); 43 IDS_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION);
44 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 44 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
45 #if defined(GOOGLE_CHROME_BUILD) 45 #if defined(GOOGLE_CHROME_BUILD)
46 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, 46 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE,
47 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE); 47 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE);
48 #endif // defined(GOOGLE_CHROME_BUILD) 48 #endif // defined(GOOGLE_CHROME_BUILD)
49 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE, 49 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE,
50 IDS_MEDIA_ROUTER_REPORT_ISSUE); 50 IDS_MEDIA_ROUTER_REPORT_ISSUE);
51 } 51 }
52 52
53 MediaRouterContextualMenu::~MediaRouterContextualMenu() { 53 MediaRouterContextualMenu::~MediaRouterContextualMenu() {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 std::string(url::kStandardSchemeSeparator) + 151 std::string(url::kStandardSchemeSeparator) +
152 media_router->media_route_provider_extension_id() + 152 media_router->media_route_provider_extension_id() +
153 "/feedback.html"); 153 "/feedback.html");
154 chrome::ShowSingletonTab(browser_, GURL(feedback_url)); 154 chrome::ShowSingletonTab(browser_, GURL(feedback_url));
155 } 155 }
156 156
157 void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() { 157 void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() {
158 ToolbarActionsModel::Get(browser_->profile())->component_migration_helper() 158 ToolbarActionsModel::Get(browser_->profile())->component_migration_helper()
159 ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId); 159 ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId);
160 } 160 }
OLDNEW
« no previous file with comments | « chrome/app/media_router_strings.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698