| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "chrome/browser/extensions/extension_action_runner.h" | 8 #include "chrome/browser/extensions/extension_action_runner.h" |
| 9 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" | 9 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" |
| 10 #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h" | 10 #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 ASSERT_TRUE(action_runner); | 134 ASSERT_TRUE(action_runner); |
| 135 action_runner->RequestScriptInjectionForTesting( | 135 action_runner->RequestScriptInjectionForTesting( |
| 136 browser_action_ext.get(), extensions::UserScript::DOCUMENT_IDLE, | 136 browser_action_ext.get(), extensions::UserScript::DOCUMENT_IDLE, |
| 137 base::Bind(&base::DoNothing)); | 137 base::Bind(&base::DoNothing)); |
| 138 image_source = | 138 image_source = |
| 139 browser_action->GetIconImageSourceForTesting(web_contents, kSize); | 139 browser_action->GetIconImageSourceForTesting(web_contents, kSize); |
| 140 EXPECT_FALSE(image_source->grayscale()); | 140 EXPECT_FALSE(image_source->grayscale()); |
| 141 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 141 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
| 142 EXPECT_TRUE(image_source->paint_blocked_actions_decoration()); | 142 EXPECT_TRUE(image_source->paint_blocked_actions_decoration()); |
| 143 | 143 |
| 144 action_runner->OnClicked(browser_action_ext.get()); | 144 action_runner->RunBlockedActions(browser_action_ext.get()); |
| 145 image_source = | 145 image_source = |
| 146 browser_action->GetIconImageSourceForTesting(web_contents, kSize); | 146 browser_action->GetIconImageSourceForTesting(web_contents, kSize); |
| 147 EXPECT_FALSE(image_source->grayscale()); | 147 EXPECT_FALSE(image_source->grayscale()); |
| 148 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 148 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
| 149 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); | 149 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); |
| 150 | 150 |
| 151 scoped_refptr<const extensions::Extension> page_action_ext = | 151 scoped_refptr<const extensions::Extension> page_action_ext = |
| 152 CreateAndAddExtension( | 152 CreateAndAddExtension( |
| 153 "page action", extensions::extension_action_test_util::PAGE_ACTION); | 153 "page action", extensions::extension_action_test_util::PAGE_ACTION); |
| 154 ASSERT_EQ(2u, toolbar_actions_bar()->GetIconCount()); | 154 ASSERT_EQ(2u, toolbar_actions_bar()->GetIconCount()); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 184 image_source = | 184 image_source = |
| 185 overflow_page_action->GetIconImageSourceForTesting(web_contents, kSize); | 185 overflow_page_action->GetIconImageSourceForTesting(web_contents, kSize); |
| 186 EXPECT_FALSE(image_source->grayscale()); | 186 EXPECT_FALSE(image_source->grayscale()); |
| 187 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 187 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
| 188 EXPECT_TRUE(image_source->paint_blocked_actions_decoration()); | 188 EXPECT_TRUE(image_source->paint_blocked_actions_decoration()); |
| 189 | 189 |
| 190 SetActionWantsToRunOnTab(overflow_page_action->extension_action(), | 190 SetActionWantsToRunOnTab(overflow_page_action->extension_action(), |
| 191 web_contents, false); | 191 web_contents, false); |
| 192 toolbar_model()->SetVisibleIconCount(2u); | 192 toolbar_model()->SetVisibleIconCount(2u); |
| 193 | 193 |
| 194 action_runner->OnClicked(page_action_ext.get()); | 194 action_runner->RunBlockedActions(page_action_ext.get()); |
| 195 image_source = page_action->GetIconImageSourceForTesting(web_contents, kSize); | 195 image_source = page_action->GetIconImageSourceForTesting(web_contents, kSize); |
| 196 EXPECT_TRUE(image_source->grayscale()); | 196 EXPECT_TRUE(image_source->grayscale()); |
| 197 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 197 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
| 198 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); | 198 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); |
| 199 } | 199 } |
| 200 | 200 |
| 201 TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionContextMenu) { | 201 TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionContextMenu) { |
| 202 CreateAndAddExtension("extension", | 202 CreateAndAddExtension("extension", |
| 203 extensions::extension_action_test_util::BROWSER_ACTION); | 203 extensions::extension_action_test_util::BROWSER_ACTION); |
| 204 EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount()); | 204 EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount()); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 225 check_visibility_string(overflow_bar()->GetActions()[0], | 225 check_visibility_string(overflow_bar()->GetActions()[0], |
| 226 IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR); | 226 IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR); |
| 227 base::RunLoop run_loop; | 227 base::RunLoop run_loop; |
| 228 toolbar_actions_bar()->PopOutAction(toolbar_actions_bar()->GetActions()[0], | 228 toolbar_actions_bar()->PopOutAction(toolbar_actions_bar()->GetActions()[0], |
| 229 false, | 229 false, |
| 230 run_loop.QuitClosure()); | 230 run_loop.QuitClosure()); |
| 231 run_loop.Run(); | 231 run_loop.Run(); |
| 232 check_visibility_string(toolbar_actions_bar()->GetActions()[0], | 232 check_visibility_string(toolbar_actions_bar()->GetActions()[0], |
| 233 IDS_EXTENSIONS_KEEP_BUTTON_IN_TOOLBAR); | 233 IDS_EXTENSIONS_KEEP_BUTTON_IN_TOOLBAR); |
| 234 } | 234 } |
| OLD | NEW |