Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 24 matching lines...) Expand all Loading... | |
| 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_EXTENSIONS_UNINSTALL); |
| 44 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); | 44 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); |
| 45 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES, | |
| 46 IDS_MEDIA_ROUTER_MANAGE_DEVICES); | |
| 45 #if defined(GOOGLE_CHROME_BUILD) | 47 #if defined(GOOGLE_CHROME_BUILD) |
| 46 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, | 48 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, |
| 47 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE); | 49 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE); |
| 48 #endif // defined(GOOGLE_CHROME_BUILD) | 50 #endif // defined(GOOGLE_CHROME_BUILD) |
| 49 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE, | 51 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE, |
| 50 IDS_MEDIA_ROUTER_REPORT_ISSUE); | 52 IDS_MEDIA_ROUTER_REPORT_ISSUE); |
| 51 } | 53 } |
| 52 | 54 |
| 53 MediaRouterContextualMenu::~MediaRouterContextualMenu() { | 55 MediaRouterContextualMenu::~MediaRouterContextualMenu() { |
| 54 } | 56 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 } | 94 } |
| 93 | 95 |
| 94 void MediaRouterContextualMenu::ExecuteCommand(int command_id, | 96 void MediaRouterContextualMenu::ExecuteCommand(int command_id, |
| 95 int event_flags) { | 97 int event_flags) { |
| 96 const char kAboutPageUrl[] = | 98 const char kAboutPageUrl[] = |
| 97 "https://www.google.com/chrome/devices/chromecast/"; | 99 "https://www.google.com/chrome/devices/chromecast/"; |
| 98 const char kCastHelpCenterPageUrl[] = | 100 const char kCastHelpCenterPageUrl[] = |
| 99 "https://support.google.com/chromecast/topic/3447927"; | 101 "https://support.google.com/chromecast/topic/3447927"; |
| 100 const char kCastLearnMorePageUrl[] = | 102 const char kCastLearnMorePageUrl[] = |
| 101 "https://support.google.com/chromecast/answer/2998338"; | 103 "https://support.google.com/chromecast/answer/2998338"; |
| 104 const char kManageCastDevicesUrl[] = "chrome://cast"; | |
| 102 | 105 |
| 103 #if defined(GOOGLE_CHROME_BUILD) | 106 #if defined(GOOGLE_CHROME_BUILD) |
| 104 PrefService* pref_service; | 107 PrefService* pref_service; |
| 105 #endif // defined(GOOGLE_CHROME_BUILD) | 108 #endif // defined(GOOGLE_CHROME_BUILD) |
| 106 switch (command_id) { | 109 switch (command_id) { |
| 107 case IDC_MEDIA_ROUTER_ABOUT: | 110 case IDC_MEDIA_ROUTER_ABOUT: |
| 108 chrome::ShowSingletonTab(browser_, GURL(kAboutPageUrl)); | 111 chrome::ShowSingletonTab(browser_, GURL(kAboutPageUrl)); |
| 109 break; | 112 break; |
| 110 #if defined(GOOGLE_CHROME_BUILD) | 113 #if defined(GOOGLE_CHROME_BUILD) |
| 111 case IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE: | 114 case IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE: |
| 112 pref_service = browser_->profile()->GetPrefs(); | 115 pref_service = browser_->profile()->GetPrefs(); |
| 113 pref_service->SetBoolean(prefs::kMediaRouterEnableCloudServices, | 116 pref_service->SetBoolean(prefs::kMediaRouterEnableCloudServices, |
| 114 !pref_service->GetBoolean(prefs::kMediaRouterEnableCloudServices)); | 117 !pref_service->GetBoolean(prefs::kMediaRouterEnableCloudServices)); |
| 115 | 118 |
| 116 // If this has been set before, this is a no-op. | 119 // If this has been set before, this is a no-op. |
| 117 pref_service->SetBoolean(prefs::kMediaRouterCloudServicesPrefSet, | 120 pref_service->SetBoolean(prefs::kMediaRouterCloudServicesPrefSet, |
| 118 true); | 121 true); |
| 119 break; | 122 break; |
| 120 #endif // defined(GOOGLE_CHROME_BUILD) | 123 #endif // defined(GOOGLE_CHROME_BUILD) |
| 121 case IDC_MEDIA_ROUTER_HELP: | 124 case IDC_MEDIA_ROUTER_HELP: |
| 122 chrome::ShowSingletonTab(browser_, GURL(kCastHelpCenterPageUrl)); | 125 chrome::ShowSingletonTab(browser_, GURL(kCastHelpCenterPageUrl)); |
| 123 base::RecordAction(base::UserMetricsAction( | 126 base::RecordAction(base::UserMetricsAction( |
| 124 "MediaRouter_Ui_Navigate_Help")); | 127 "MediaRouter_Ui_Navigate_Help")); |
| 125 break; | 128 break; |
| 126 case IDC_MEDIA_ROUTER_LEARN_MORE: | 129 case IDC_MEDIA_ROUTER_LEARN_MORE: |
| 127 chrome::ShowSingletonTab(browser_, GURL(kCastLearnMorePageUrl)); | 130 chrome::ShowSingletonTab(browser_, GURL(kCastLearnMorePageUrl)); |
| 128 break; | 131 break; |
| 132 case IDC_MEDIA_ROUTER_MANAGE_DEVICES: | |
| 133 chrome::ShowSingletonTab(browser_, GURL(kManageCastDevicesUrl)); | |
|
apacible
2016/06/27 19:54:56
Do we expect this URL to change in the future? If
sheretov
2016/06/27 20:17:26
Done.
| |
| 134 break; | |
| 129 case IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION: | 135 case IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION: |
| 130 RemoveMediaRouterComponentAction(); | 136 RemoveMediaRouterComponentAction(); |
| 131 break; | 137 break; |
| 132 case IDC_MEDIA_ROUTER_REPORT_ISSUE: | 138 case IDC_MEDIA_ROUTER_REPORT_ISSUE: |
| 133 ReportIssue(); | 139 ReportIssue(); |
| 134 break; | 140 break; |
| 135 default: | 141 default: |
| 136 NOTREACHED(); | 142 NOTREACHED(); |
| 137 } | 143 } |
| 138 } | 144 } |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 151 std::string(url::kStandardSchemeSeparator) + | 157 std::string(url::kStandardSchemeSeparator) + |
| 152 media_router->media_route_provider_extension_id() + | 158 media_router->media_route_provider_extension_id() + |
| 153 "/feedback.html"); | 159 "/feedback.html"); |
| 154 chrome::ShowSingletonTab(browser_, GURL(feedback_url)); | 160 chrome::ShowSingletonTab(browser_, GURL(feedback_url)); |
| 155 } | 161 } |
| 156 | 162 |
| 157 void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() { | 163 void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() { |
| 158 ToolbarActionsModel::Get(browser_->profile())->component_migration_helper() | 164 ToolbarActionsModel::Get(browser_->profile())->component_migration_helper() |
| 159 ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId); | 165 ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId); |
| 160 } | 166 } |
| OLD | NEW |