Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Side by Side Diff: chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc

Issue 2105393002: [Extensions UI] Handle multiple warning bubbles racing to show (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" 6 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h"
7 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 7 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
8 #include "chrome/browser/ui/views/frame/browser_view.h" 8 #include "chrome/browser/ui/views/frame/browser_view.h"
9 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 9 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
10 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 10 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
11 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
11 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 12 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
12 #include "ui/views/bubble/bubble_dialog_delegate.h" 13 #include "ui/views/bubble/bubble_dialog_delegate.h"
14 #include "ui/views/controls/link.h"
15 #include "ui/views/controls/link_listener.h"
16 #include "ui/views/window/dialog_client_view.h"
13 17
14 namespace { 18 namespace {
15 19
16 // Returns the ToolbarView for the given |browser|. 20 // Returns the ToolbarView for the given |browser|.
17 ToolbarView* GetToolbarViewForBrowser(Browser* browser) { 21 ToolbarView* GetToolbarViewForBrowser(Browser* browser) {
18 return BrowserView::GetBrowserViewForBrowser(browser)->toolbar(); 22 return BrowserView::GetBrowserViewForBrowser(browser)->toolbar();
19 } 23 }
20 24
25 ToolbarActionsBarBubbleViews* GetBubbleForBrowser(Browser* browser) {
26 return static_cast<ToolbarActionsBarBubbleViews*>(
27 GetToolbarViewForBrowser(browser)->browser_actions()->active_bubble());
28 }
29
21 // Checks that the |bubble| is using the |expected_reference_view|, and is in 30 // Checks that the |bubble| is using the |expected_reference_view|, and is in
22 // approximately the correct position. 31 // approximately the correct position.
23 void CheckBubbleAndReferenceView(views::BubbleDialogDelegateView* bubble, 32 void CheckBubbleAndReferenceView(views::BubbleDialogDelegateView* bubble,
24 views::View* expected_reference_view) { 33 views::View* expected_reference_view) {
25 ASSERT_TRUE(bubble); 34 ASSERT_TRUE(bubble);
26 ASSERT_TRUE(expected_reference_view); 35 ASSERT_TRUE(expected_reference_view);
27 EXPECT_EQ(expected_reference_view, bubble->GetAnchorView()); 36 EXPECT_EQ(expected_reference_view, bubble->GetAnchorView());
28 37
29 // Do a rough check that the bubble is in the right place. 38 // Do a rough check that the bubble is in the right place.
30 gfx::Rect bubble_bounds = bubble->GetWidget()->GetWindowBoundsInScreen(); 39 gfx::Rect bubble_bounds = bubble->GetWidget()->GetWindowBoundsInScreen();
(...skipping 15 matching lines...) Expand all
46 } // namespace 55 } // namespace
47 56
48 class ExtensionMessageBubbleViewBrowserTest 57 class ExtensionMessageBubbleViewBrowserTest
49 : public ExtensionMessageBubbleBrowserTest { 58 : public ExtensionMessageBubbleBrowserTest {
50 protected: 59 protected:
51 ExtensionMessageBubbleViewBrowserTest() {} 60 ExtensionMessageBubbleViewBrowserTest() {}
52 ~ExtensionMessageBubbleViewBrowserTest() override {} 61 ~ExtensionMessageBubbleViewBrowserTest() override {}
53 62
54 private: 63 private:
55 // ExtensionMessageBubbleBrowserTest: 64 // ExtensionMessageBubbleBrowserTest:
56 void CheckBubble(Browser* browser, AnchorPosition anchor) override; 65 void CheckBubbleNative(Browser* browser, AnchorPosition anchor) override;
57 void CloseBubble(Browser* browser) override; 66 void CloseBubbleNative(Browser* browser) override;
58 void CheckBubbleIsNotPresent(Browser* browser) override; 67 void CheckBubbleIsNotPresentNative(Browser* browser) override;
68 void ClickLearnMoreButton(Browser* browser) override;
69 void ClickActionButton(Browser* browser) override;
70 void ClickDismissButton(Browser* browser) override;
59 71
60 DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest); 72 DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest);
61 }; 73 };
62 74
63 class ExtensionMessageBubbleViewBrowserTestRedesign 75 class ExtensionMessageBubbleViewBrowserTestRedesign
64 : public ExtensionMessageBubbleViewBrowserTest { 76 : public ExtensionMessageBubbleViewBrowserTest {
65 protected: 77 protected:
66 void SetUpCommandLine(base::CommandLine* command_line) override { 78 void SetUpCommandLine(base::CommandLine* command_line) override {
67 ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(command_line); 79 ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(command_line);
68 override_redesign_.reset(); 80 override_redesign_.reset();
69 } 81 }
70 }; 82 };
71 83
72 void ExtensionMessageBubbleViewBrowserTest::CheckBubble(Browser* browser, 84 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleNative(
73 AnchorPosition anchor) { 85 Browser* browser,
86 AnchorPosition anchor) {
74 ToolbarView* toolbar_view = GetToolbarViewForBrowser(browser); 87 ToolbarView* toolbar_view = GetToolbarViewForBrowser(browser);
75 BrowserActionsContainer* container = toolbar_view->browser_actions(); 88 BrowserActionsContainer* container = toolbar_view->browser_actions();
76 views::BubbleDialogDelegateView* bubble = container->active_bubble(); 89 views::BubbleDialogDelegateView* bubble = container->active_bubble();
77 views::View* anchor_view = nullptr; 90 views::View* anchor_view = nullptr;
78 switch (anchor) { 91 switch (anchor) {
79 case ANCHOR_BROWSER_ACTION: 92 case ANCHOR_BROWSER_ACTION:
80 DCHECK_GT(container->num_toolbar_actions(), 0u); 93 DCHECK_GT(container->num_toolbar_actions(), 0u);
81 anchor_view = container->GetToolbarActionViewAt(0); 94 anchor_view = container->GetToolbarActionViewAt(0);
82 break; 95 break;
83 case ANCHOR_APP_MENU: 96 case ANCHOR_APP_MENU:
84 anchor_view = toolbar_view->app_menu_button(); 97 anchor_view = toolbar_view->app_menu_button();
85 break; 98 break;
86 } 99 }
87 CheckBubbleAndReferenceView(bubble, anchor_view); 100 CheckBubbleAndReferenceView(bubble, anchor_view);
88 } 101 }
89 102
90 void ExtensionMessageBubbleViewBrowserTest::CloseBubble(Browser* browser) { 103 void ExtensionMessageBubbleViewBrowserTest::CloseBubbleNative(
104 Browser* browser) {
91 BrowserActionsContainer* container = 105 BrowserActionsContainer* container =
92 GetToolbarViewForBrowser(browser)->browser_actions(); 106 GetToolbarViewForBrowser(browser)->browser_actions();
93 views::BubbleDialogDelegateView* bubble = container->active_bubble(); 107 views::BubbleDialogDelegateView* bubble = container->active_bubble();
94 ASSERT_TRUE(bubble); 108 ASSERT_TRUE(bubble);
95 bubble->GetWidget()->Close(); 109 bubble->GetWidget()->Close();
96 EXPECT_EQ(nullptr, container->active_bubble()); 110 EXPECT_EQ(nullptr, container->active_bubble());
97 } 111 }
98 112
99 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleIsNotPresent( 113 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleIsNotPresentNative(
100 Browser* browser) { 114 Browser* browser) {
101 EXPECT_EQ( 115 EXPECT_EQ(
102 nullptr, 116 nullptr,
103 GetToolbarViewForBrowser(browser)->browser_actions()->active_bubble()); 117 GetToolbarViewForBrowser(browser)->browser_actions()->active_bubble());
104 } 118 }
105 119
120 void ExtensionMessageBubbleViewBrowserTest::ClickLearnMoreButton(
121 Browser* browser) {
122 ToolbarActionsBarBubbleViews* bubble = GetBubbleForBrowser(browser);
123 static_cast<views::LinkListener*>(bubble)->LinkClicked(
124 const_cast<views::Link*>(bubble->learn_more_button()), 0);
125 }
126
127 void ExtensionMessageBubbleViewBrowserTest::ClickActionButton(
128 Browser* browser) {
129 ToolbarActionsBarBubbleViews* bubble = GetBubbleForBrowser(browser);
130 bubble->GetDialogClientView()->AcceptWindow();
131 }
132
133 void ExtensionMessageBubbleViewBrowserTest::ClickDismissButton(
134 Browser* browser) {
135 ToolbarActionsBarBubbleViews* bubble = GetBubbleForBrowser(browser);
136 bubble->GetDialogClientView()->CancelWindow();
137 }
138
106 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, 139 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
107 ExtensionBubbleAnchoredToExtensionAction) { 140 ExtensionBubbleAnchoredToExtensionAction) {
108 TestBubbleAnchoredToExtensionAction(); 141 TestBubbleAnchoredToExtensionAction();
109 } 142 }
110 143
111 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, 144 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
112 ExtensionBubbleAnchoredToAppMenu) { 145 ExtensionBubbleAnchoredToAppMenu) {
113 TestBubbleAnchoredToAppMenu(); 146 TestBubbleAnchoredToAppMenu();
114 } 147 }
115 148
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign, 182 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign,
150 TestControlledHomeMessageBubble) { 183 TestControlledHomeMessageBubble) {
151 TestControlledHomeBubbleShown(); 184 TestControlledHomeBubbleShown();
152 } 185 }
153 186
154 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign, 187 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign,
155 TestControlledSearchMessageBubble) { 188 TestControlledSearchMessageBubble) {
156 TestControlledSearchBubbleShown(); 189 TestControlledSearchBubbleShown();
157 } 190 }
158 #endif // defined(OS_WIN) 191 #endif // defined(OS_WIN)
192
193 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
194 TestBubbleWithMultipleWindows) {
195 TestBubbleWithMultipleWindows();
196 }
197
198 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
199 TestClickingLearnMoreButton) {
200 TestClickingLearnMoreButton();
201 }
202
203 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
204 TestClickingActionButton) {
205 TestClickingActionButton();
206 }
207
208 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
209 TestClickingDismissButton) {
210 TestClickingDismissButton();
211 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698