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 15 matching lines...) Expand all Loading... |
26 | 26 |
27 AddTab(browser(), GURL("chrome://newtab")); | 27 AddTab(browser(), GURL("chrome://newtab")); |
28 | 28 |
29 gfx::Size size(ToolbarActionsBar::IconWidth(false), | 29 gfx::Size size(ToolbarActionsBar::IconWidth(false), |
30 ToolbarActionsBar::IconHeight()); | 30 ToolbarActionsBar::IconHeight()); |
31 content::WebContents* web_contents = | 31 content::WebContents* web_contents = |
32 browser()->tab_strip_model()->GetActiveWebContents(); | 32 browser()->tab_strip_model()->GetActiveWebContents(); |
33 ExtensionActionViewController* action = | 33 ExtensionActionViewController* action = |
34 static_cast<ExtensionActionViewController*>( | 34 static_cast<ExtensionActionViewController*>( |
35 toolbar_actions_bar()->GetActions()[0]); | 35 toolbar_actions_bar()->GetActions()[0]); |
36 scoped_ptr<IconWithBadgeImageSource> image_source = | 36 std::unique_ptr<IconWithBadgeImageSource> image_source = |
37 action->GetIconImageSourceForTesting(web_contents, size); | 37 action->GetIconImageSourceForTesting(web_contents, size); |
38 EXPECT_FALSE(image_source->grayscale()); | 38 EXPECT_FALSE(image_source->grayscale()); |
39 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 39 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
40 | 40 |
41 SetActionWantsToRunOnTab(action->extension_action(), web_contents, false); | 41 SetActionWantsToRunOnTab(action->extension_action(), web_contents, false); |
42 image_source = action->GetIconImageSourceForTesting(web_contents, size); | 42 image_source = action->GetIconImageSourceForTesting(web_contents, size); |
43 EXPECT_FALSE(image_source->grayscale()); | 43 EXPECT_FALSE(image_source->grayscale()); |
44 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 44 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
45 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); | 45 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); |
46 | 46 |
(...skipping 21 matching lines...) Expand all Loading... |
68 | 68 |
69 AddTab(browser(), GURL("chrome://newtab")); | 69 AddTab(browser(), GURL("chrome://newtab")); |
70 | 70 |
71 gfx::Size size(ToolbarActionsBar::IconWidth(false), | 71 gfx::Size size(ToolbarActionsBar::IconWidth(false), |
72 ToolbarActionsBar::IconHeight()); | 72 ToolbarActionsBar::IconHeight()); |
73 content::WebContents* web_contents = | 73 content::WebContents* web_contents = |
74 browser()->tab_strip_model()->GetActiveWebContents(); | 74 browser()->tab_strip_model()->GetActiveWebContents(); |
75 ExtensionActionViewController* action = | 75 ExtensionActionViewController* action = |
76 static_cast<ExtensionActionViewController*>( | 76 static_cast<ExtensionActionViewController*>( |
77 toolbar_actions_bar()->GetActions()[0]); | 77 toolbar_actions_bar()->GetActions()[0]); |
78 scoped_ptr<IconWithBadgeImageSource> image_source = | 78 std::unique_ptr<IconWithBadgeImageSource> image_source = |
79 action->GetIconImageSourceForTesting(web_contents, size); | 79 action->GetIconImageSourceForTesting(web_contents, size); |
80 EXPECT_TRUE(image_source->grayscale()); | 80 EXPECT_TRUE(image_source->grayscale()); |
81 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 81 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
82 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); | 82 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); |
83 | 83 |
84 SetActionWantsToRunOnTab(action->extension_action(), web_contents, true); | 84 SetActionWantsToRunOnTab(action->extension_action(), web_contents, true); |
85 image_source = action->GetIconImageSourceForTesting(web_contents, size); | 85 image_source = action->GetIconImageSourceForTesting(web_contents, size); |
86 EXPECT_FALSE(image_source->grayscale()); | 86 EXPECT_FALSE(image_source->grayscale()); |
87 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 87 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
88 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); | 88 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); |
(...skipping 27 matching lines...) Expand all Loading... |
116 ExtensionActionViewController* browser_action = | 116 ExtensionActionViewController* browser_action = |
117 static_cast<ExtensionActionViewController*>( | 117 static_cast<ExtensionActionViewController*>( |
118 toolbar_actions_bar()->GetActions()[0]); | 118 toolbar_actions_bar()->GetActions()[0]); |
119 EXPECT_EQ(browser_action_ext.get(), browser_action->extension()); | 119 EXPECT_EQ(browser_action_ext.get(), browser_action->extension()); |
120 | 120 |
121 content::WebContents* web_contents = | 121 content::WebContents* web_contents = |
122 browser()->tab_strip_model()->GetActiveWebContents(); | 122 browser()->tab_strip_model()->GetActiveWebContents(); |
123 ASSERT_TRUE(web_contents); | 123 ASSERT_TRUE(web_contents); |
124 const gfx::Size kSize(ToolbarActionsBar::IconWidth(false), | 124 const gfx::Size kSize(ToolbarActionsBar::IconWidth(false), |
125 ToolbarActionsBar::IconHeight()); | 125 ToolbarActionsBar::IconHeight()); |
126 scoped_ptr<IconWithBadgeImageSource> image_source = | 126 std::unique_ptr<IconWithBadgeImageSource> image_source = |
127 browser_action->GetIconImageSourceForTesting(web_contents, kSize); | 127 browser_action->GetIconImageSourceForTesting(web_contents, kSize); |
128 EXPECT_FALSE(image_source->grayscale()); | 128 EXPECT_FALSE(image_source->grayscale()); |
129 EXPECT_FALSE(image_source->paint_page_action_decoration()); | 129 EXPECT_FALSE(image_source->paint_page_action_decoration()); |
130 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); | 130 EXPECT_FALSE(image_source->paint_blocked_actions_decoration()); |
131 | 131 |
132 extensions::ExtensionActionRunner* action_runner = | 132 extensions::ExtensionActionRunner* action_runner = |
133 extensions::ExtensionActionRunner::GetForWebContents(web_contents); | 133 extensions::ExtensionActionRunner::GetForWebContents(web_contents); |
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, |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after 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 |