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 "chrome/browser/ui/toolbar/media_router_contextual_menu.h" | 5 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/user_metrics.h" | 10 #include "base/metrics/user_metrics.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
23 #include "chrome/grit/chromium_strings.h" | 23 #include "chrome/grit/chromium_strings.h" |
24 #include "chrome/grit/generated_resources.h" | 24 #include "chrome/grit/generated_resources.h" |
25 #include "components/signin/core/browser/signin_manager.h" | 25 #include "components/signin/core/browser/signin_manager.h" |
26 #include "extensions/common/constants.h" | 26 #include "extensions/common/constants.h" |
27 #include "ui/base/models/menu_model_delegate.h" | 27 #include "ui/base/models/menu_model_delegate.h" |
28 #include "ui/gfx/color_palette.h" | 28 #include "ui/gfx/color_palette.h" |
29 #include "ui/gfx/paint_vector_icon.h" | 29 #include "ui/gfx/paint_vector_icon.h" |
30 #include "ui/gfx/vector_icons_public.h" | 30 #include "ui/gfx/vector_icons_public.h" |
31 | 31 |
32 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser) | 32 // static |
33 : MediaRouterContextualMenu( | 33 std::unique_ptr<MediaRouterContextualMenu> |
34 browser, | 34 MediaRouterContextualMenu::CreateForToolbar(Browser* browser) { |
35 MediaRouterActionController::IsActionShownByPolicy( | 35 return base::MakeUnique<MediaRouterContextualMenu>( |
36 browser->profile())) {} | 36 browser, true, |
| 37 MediaRouterActionController::IsActionShownByPolicy(browser->profile())); |
| 38 } |
| 39 |
| 40 // static |
| 41 std::unique_ptr<MediaRouterContextualMenu> |
| 42 MediaRouterContextualMenu::CreateForOverflowMenu(Browser* browser) { |
| 43 return base::MakeUnique<MediaRouterContextualMenu>( |
| 44 browser, false, |
| 45 MediaRouterActionController::IsActionShownByPolicy(browser->profile())); |
| 46 } |
37 | 47 |
38 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser, | 48 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser, |
| 49 bool is_in_toolbar, |
39 bool shown_by_policy) | 50 bool shown_by_policy) |
40 : browser_(browser), menu_model_(this) { | 51 : browser_(browser), menu_model_(this), is_in_toolbar_(is_in_toolbar) { |
41 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT, | 52 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT, |
42 IDS_MEDIA_ROUTER_ABOUT); | 53 IDS_MEDIA_ROUTER_ABOUT); |
43 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); | 54 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); |
44 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE, | 55 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE, |
45 IDS_MEDIA_ROUTER_LEARN_MORE); | 56 IDS_MEDIA_ROUTER_LEARN_MORE); |
46 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP, | 57 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP, |
47 IDS_MEDIA_ROUTER_HELP); | 58 IDS_MEDIA_ROUTER_HELP); |
48 if (shown_by_policy) { | 59 if (shown_by_policy) { |
49 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY, | 60 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY, |
50 IDS_MEDIA_ROUTER_SHOWN_BY_POLICY); | 61 IDS_MEDIA_ROUTER_SHOWN_BY_POLICY); |
51 menu_model_.SetIcon( | 62 menu_model_.SetIcon( |
52 menu_model_.GetIndexOfCommandId(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY), | 63 menu_model_.GetIndexOfCommandId(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY), |
53 gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS, 16, | 64 gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS, 16, |
54 gfx::kChromeIconGrey))); | 65 gfx::kChromeIconGrey))); |
55 } else { | 66 } else { |
56 menu_model_.AddCheckItemWithStringId( | 67 menu_model_.AddCheckItemWithStringId( |
57 IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, | 68 IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, |
58 IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION); | 69 IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION); |
59 } | 70 } |
| 71 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR, |
| 72 GetChangeVisibilityTextId()); |
60 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); | 73 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); |
61 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | 74 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) |
62 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES, | 75 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES, |
63 IDS_MEDIA_ROUTER_MANAGE_DEVICES); | 76 IDS_MEDIA_ROUTER_MANAGE_DEVICES); |
64 #endif | 77 #endif |
65 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, | 78 menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, |
66 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE); | 79 IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE); |
67 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE, | 80 menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE, |
68 IDS_MEDIA_ROUTER_REPORT_ISSUE); | 81 IDS_MEDIA_ROUTER_REPORT_ISSUE); |
69 } | 82 } |
(...skipping 14 matching lines...) Expand all Loading... |
84 if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) { | 97 if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) { |
85 return browser_->profile()->GetPrefs()->GetBoolean( | 98 return browser_->profile()->GetPrefs()->GetBoolean( |
86 prefs::kMediaRouterEnableCloudServices); | 99 prefs::kMediaRouterEnableCloudServices); |
87 } | 100 } |
88 if (command_id == IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION) | 101 if (command_id == IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION) |
89 return GetAlwaysShowActionPref(); | 102 return GetAlwaysShowActionPref(); |
90 return false; | 103 return false; |
91 } | 104 } |
92 | 105 |
93 bool MediaRouterContextualMenu::IsCommandIdEnabled(int command_id) const { | 106 bool MediaRouterContextualMenu::IsCommandIdEnabled(int command_id) const { |
| 107 // If the action is in the ephemeral state, disable the menu item for moving |
| 108 // it between the toolbar and the overflow menu, since the preference would |
| 109 // not persist. |
| 110 if (command_id == IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR) |
| 111 return GetAlwaysShowActionPref(); |
94 return command_id != IDC_MEDIA_ROUTER_SHOWN_BY_POLICY; | 112 return command_id != IDC_MEDIA_ROUTER_SHOWN_BY_POLICY; |
95 } | 113 } |
96 | 114 |
97 bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { | 115 bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { |
98 if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) { | 116 if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) { |
99 // Cloud services preference is not set or used if the user is not signed | 117 // Cloud services preference is not set or used if the user is not signed |
100 // in. | 118 // in. |
101 SigninManagerBase* signin_manager = | 119 SigninManagerBase* signin_manager = |
102 SigninManagerFactory::GetForProfile(browser_->profile()); | 120 SigninManagerFactory::GetForProfile(browser_->profile()); |
103 return signin_manager && signin_manager->IsAuthenticated(); | 121 return signin_manager && signin_manager->IsAuthenticated(); |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 chrome::ShowSingletonTab(browser_, GURL(kCastLearnMorePageUrl)); | 157 chrome::ShowSingletonTab(browser_, GURL(kCastLearnMorePageUrl)); |
140 break; | 158 break; |
141 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) | 159 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) |
142 case IDC_MEDIA_ROUTER_MANAGE_DEVICES: | 160 case IDC_MEDIA_ROUTER_MANAGE_DEVICES: |
143 chrome::ShowSingletonTab(browser_, GURL(chrome::kChromeUICastURL)); | 161 chrome::ShowSingletonTab(browser_, GURL(chrome::kChromeUICastURL)); |
144 break; | 162 break; |
145 #endif | 163 #endif |
146 case IDC_MEDIA_ROUTER_REPORT_ISSUE: | 164 case IDC_MEDIA_ROUTER_REPORT_ISSUE: |
147 ReportIssue(); | 165 ReportIssue(); |
148 break; | 166 break; |
| 167 case IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR: |
| 168 ToolbarActionsModel::Get(browser_->profile()) |
| 169 ->SetActionVisibility( |
| 170 ComponentToolbarActionsFactory::kMediaRouterActionId, |
| 171 !is_in_toolbar_); |
| 172 break; |
149 default: | 173 default: |
150 NOTREACHED(); | 174 NOTREACHED(); |
151 } | 175 } |
152 } | 176 } |
153 | 177 |
154 void MediaRouterContextualMenu::ReportIssue() { | 178 void MediaRouterContextualMenu::ReportIssue() { |
155 // Opens feedback page loaded from the media router extension. | 179 // Opens feedback page loaded from the media router extension. |
156 // This is temporary until feedback UI is redesigned. | 180 // This is temporary until feedback UI is redesigned. |
157 // TODO(crbug.com/597778): remove reference to MediaRouterMojoImpl | 181 // TODO(crbug.com/597778): remove reference to MediaRouterMojoImpl |
158 media_router::MediaRouterMojoImpl* media_router = | 182 media_router::MediaRouterMojoImpl* media_router = |
159 static_cast<media_router::MediaRouterMojoImpl*>( | 183 static_cast<media_router::MediaRouterMojoImpl*>( |
160 media_router::MediaRouterFactory::GetApiForBrowserContext( | 184 media_router::MediaRouterFactory::GetApiForBrowserContext( |
161 static_cast<content::BrowserContext*>(browser_->profile()))); | 185 static_cast<content::BrowserContext*>(browser_->profile()))); |
162 if (media_router->media_route_provider_extension_id().empty()) | 186 if (media_router->media_route_provider_extension_id().empty()) |
163 return; | 187 return; |
164 std::string feedback_url(extensions::kExtensionScheme + | 188 std::string feedback_url(extensions::kExtensionScheme + |
165 std::string(url::kStandardSchemeSeparator) + | 189 std::string(url::kStandardSchemeSeparator) + |
166 media_router->media_route_provider_extension_id() + | 190 media_router->media_route_provider_extension_id() + |
167 "/feedback.html"); | 191 "/feedback.html"); |
168 chrome::ShowSingletonTab(browser_, GURL(feedback_url)); | 192 chrome::ShowSingletonTab(browser_, GURL(feedback_url)); |
169 } | 193 } |
| 194 |
| 195 int MediaRouterContextualMenu::GetChangeVisibilityTextId() { |
| 196 return is_in_toolbar_ ? IDS_EXTENSIONS_HIDE_BUTTON_IN_MENU |
| 197 : IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR; |
| 198 } |
OLD | NEW |