| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/extensions/browser_action_test_util.h" | 9 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 10 #include "chrome/browser/extensions/extension_action_test_util.h" | 10 #include "chrome/browser/extensions/extension_action_test_util.h" |
| 11 #include "chrome/browser/signin/fake_signin_manager_builder.h" | 11 #include "chrome/browser/signin/fake_signin_manager_builder.h" |
| 12 #include "chrome/browser/signin/signin_manager_factory.h" | 12 #include "chrome/browser/signin/signin_manager_factory.h" |
| 13 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" | 13 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
| 14 #include "chrome/browser/ui/toolbar/media_router_action.h" | 14 #include "chrome/browser/ui/toolbar/media_router_action.h" |
| 15 #include "chrome/browser/ui/toolbar/media_router_action_controller.h" |
| 15 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h" | 16 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h" |
| 16 #include "chrome/test/base/browser_with_test_window_test.h" | 17 #include "chrome/test/base/browser_with_test_window_test.h" |
| 17 | 18 |
| 18 namespace { | 19 namespace { |
| 19 | 20 |
| 20 bool HasCommandId(ui::MenuModel* menu_model, int command_id) { | 21 bool HasCommandId(ui::MenuModel* menu_model, int command_id) { |
| 21 for (int i = 0; i < menu_model->GetItemCount(); i++) { | 22 for (int i = 0; i < menu_model->GetItemCount(); i++) { |
| 22 if (menu_model->GetCommandIdAt(i) == command_id) | 23 if (menu_model->GetCommandIdAt(i) == command_id) |
| 23 return true; | 24 return true; |
| 24 } | 25 } |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 EXPECT_TRUE(menu.IsCommandIdChecked( | 133 EXPECT_TRUE(menu.IsCommandIdChecked( |
| 133 IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE)); | 134 IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE)); |
| 134 | 135 |
| 135 menu.ExecuteCommand(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, 0); | 136 menu.ExecuteCommand(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, 0); |
| 136 EXPECT_FALSE(menu.IsCommandIdChecked( | 137 EXPECT_FALSE(menu.IsCommandIdChecked( |
| 137 IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE)); | 138 IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE)); |
| 138 } | 139 } |
| 139 | 140 |
| 140 TEST_F(MediaRouterContextualMenuUnitTest, ToggleAlwaysShowIconItem) { | 141 TEST_F(MediaRouterContextualMenuUnitTest, ToggleAlwaysShowIconItem) { |
| 141 MediaRouterContextualMenu menu(browser()); | 142 MediaRouterContextualMenu menu(browser()); |
| 142 extensions::ComponentMigrationHelper* const component_migration_helper = | |
| 143 toolbar_actions_model()->component_migration_helper(); | |
| 144 | 143 |
| 145 // Whether the option is checked should reflect the pref. | 144 // Whether the option is checked should reflect the pref. |
| 146 component_migration_helper->SetComponentActionPref( | 145 MediaRouterActionController::SetAlwaysShowActionPref(profile(), true); |
| 147 ComponentToolbarActionsFactory::kMediaRouterActionId, true); | |
| 148 EXPECT_TRUE( | 146 EXPECT_TRUE( |
| 149 menu.IsCommandIdChecked(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)); | 147 menu.IsCommandIdChecked(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)); |
| 150 | 148 |
| 151 component_migration_helper->SetComponentActionPref( | 149 MediaRouterActionController::SetAlwaysShowActionPref(profile(), false); |
| 152 ComponentToolbarActionsFactory::kMediaRouterActionId, false); | |
| 153 EXPECT_FALSE( | 150 EXPECT_FALSE( |
| 154 menu.IsCommandIdChecked(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)); | 151 menu.IsCommandIdChecked(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)); |
| 155 | 152 |
| 156 // Executing the option should toggle the pref. | 153 // Executing the option should toggle the pref. |
| 157 menu.ExecuteCommand(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, 0); | 154 menu.ExecuteCommand(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, 0); |
| 158 EXPECT_TRUE(component_migration_helper->GetComponentActionPref( | 155 EXPECT_TRUE(MediaRouterActionController::GetAlwaysShowActionPref(profile())); |
| 159 ComponentToolbarActionsFactory::kMediaRouterActionId)); | |
| 160 | 156 |
| 161 menu.ExecuteCommand(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, 0); | 157 menu.ExecuteCommand(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, 0); |
| 162 EXPECT_FALSE(component_migration_helper->GetComponentActionPref( | 158 EXPECT_FALSE(MediaRouterActionController::GetAlwaysShowActionPref(profile())); |
| 163 ComponentToolbarActionsFactory::kMediaRouterActionId)); | |
| 164 } | 159 } |
| 165 | 160 |
| 166 TEST_F(MediaRouterContextualMenuUnitTest, ActionShownByPolicy) { | 161 TEST_F(MediaRouterContextualMenuUnitTest, ActionShownByPolicy) { |
| 167 // Create a contextual menu for an icon shown by administrator policy. | 162 // Create a contextual menu for an icon shown by administrator policy. |
| 168 MediaRouterContextualMenu menu(browser(), true); | 163 MediaRouterContextualMenu menu(browser(), true); |
| 169 | 164 |
| 170 // The item "Added by your administrator" should be shown disabled. | 165 // The item "Added by your administrator" should be shown disabled. |
| 171 EXPECT_TRUE(menu.IsCommandIdVisible(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY)); | 166 EXPECT_TRUE(menu.IsCommandIdVisible(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY)); |
| 172 EXPECT_FALSE(menu.IsCommandIdEnabled(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY)); | 167 EXPECT_FALSE(menu.IsCommandIdEnabled(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY)); |
| 173 | 168 |
| 174 // The checkbox item "Always show icon" should not be shown. | 169 // The checkbox item "Always show icon" should not be shown. |
| 175 EXPECT_FALSE(HasCommandId(menu.menu_model(), | 170 EXPECT_FALSE(HasCommandId(menu.menu_model(), |
| 176 IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)); | 171 IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)); |
| 177 } | 172 } |
| OLD | NEW |