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

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: 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
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 23 matching lines...) Expand all
34 : browser_(browser), 34 : browser_(browser),
35 menu_model_(this) { 35 menu_model_(this) {
36 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT, 36 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT,
37 IDS_MEDIA_ROUTER_ABOUT); 37 IDS_MEDIA_ROUTER_ABOUT);
38 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 38 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
39 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE, 39 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE,
40 IDS_MEDIA_ROUTER_LEARN_MORE); 40 IDS_MEDIA_ROUTER_LEARN_MORE);
41 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP, 41 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP,
42 IDS_MEDIA_ROUTER_HELP); 42 IDS_MEDIA_ROUTER_HELP);
43 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION, 43 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION,
44 IDS_EXTENSIONS_UNINSTALL); 44 IDS_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION);
45 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 45 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
46 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) 46 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
47 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES, 47 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES,
48 IDS_MEDIA_ROUTER_MANAGE_DEVICES); 48 IDS_MEDIA_ROUTER_MANAGE_DEVICES);
49 #endif 49 #endif
50 #if defined(GOOGLE_CHROME_BUILD) 50 #if defined(GOOGLE_CHROME_BUILD)
51 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, 51 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE,
52 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE); 52 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE);
53 #endif // defined(GOOGLE_CHROME_BUILD) 53 #endif // defined(GOOGLE_CHROME_BUILD)
54 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE, 54 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 std::string(url::kStandardSchemeSeparator) + 161 std::string(url::kStandardSchemeSeparator) +
162 media_router->media_route_provider_extension_id() + 162 media_router->media_route_provider_extension_id() +
163 "/feedback.html"); 163 "/feedback.html");
164 chrome::ShowSingletonTab(browser_, GURL(feedback_url)); 164 chrome::ShowSingletonTab(browser_, GURL(feedback_url));
165 } 165 }
166 166
167 void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() { 167 void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() {
168 ToolbarActionsModel::Get(browser_->profile())->component_migration_helper() 168 ToolbarActionsModel::Get(browser_->profile())->component_migration_helper()
169 ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId); 169 ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId);
170 } 170 }
OLDNEW
« chrome/app/media_router_strings.grdp ('K') | « chrome/app/media_router_strings.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698