| 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/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" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 } // namespace | 46 } // namespace |
| 47 | 47 |
| 48 class ExtensionMessageBubbleViewBrowserTest | 48 class ExtensionMessageBubbleViewBrowserTest |
| 49 : public ExtensionMessageBubbleBrowserTest { | 49 : public ExtensionMessageBubbleBrowserTest { |
| 50 protected: | 50 protected: |
| 51 ExtensionMessageBubbleViewBrowserTest() {} | 51 ExtensionMessageBubbleViewBrowserTest() {} |
| 52 ~ExtensionMessageBubbleViewBrowserTest() override {} | 52 ~ExtensionMessageBubbleViewBrowserTest() override {} |
| 53 | 53 |
| 54 private: | 54 private: |
| 55 // ExtensionMessageBubbleBrowserTest: | 55 // ExtensionMessageBubbleBrowserTest: |
| 56 void CheckBubble(Browser* browser, AnchorPosition anchor) override; | 56 void CheckBubbleNative(Browser* browser, AnchorPosition anchor) override; |
| 57 void CloseBubble(Browser* browser) override; | 57 void CloseBubbleNative(Browser* browser) override; |
| 58 void CheckBubbleIsNotPresent(Browser* browser) override; | 58 void CheckBubbleIsNotPresentNative(Browser* browser) override; |
| 59 | 59 |
| 60 DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest); | 60 DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest); |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 class ExtensionMessageBubbleViewBrowserTestRedesign | 63 class ExtensionMessageBubbleViewBrowserTestRedesign |
| 64 : public ExtensionMessageBubbleViewBrowserTest { | 64 : public ExtensionMessageBubbleViewBrowserTest { |
| 65 protected: | 65 protected: |
| 66 void SetUpCommandLine(base::CommandLine* command_line) override { | 66 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 67 ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(command_line); | 67 ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(command_line); |
| 68 override_redesign_.reset(); | 68 override_redesign_.reset(); |
| 69 } | 69 } |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 void ExtensionMessageBubbleViewBrowserTest::CheckBubble(Browser* browser, | 72 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleNative( |
| 73 AnchorPosition anchor) { | 73 Browser* browser, |
| 74 AnchorPosition anchor) { |
| 74 ToolbarView* toolbar_view = GetToolbarViewForBrowser(browser); | 75 ToolbarView* toolbar_view = GetToolbarViewForBrowser(browser); |
| 75 BrowserActionsContainer* container = toolbar_view->browser_actions(); | 76 BrowserActionsContainer* container = toolbar_view->browser_actions(); |
| 76 views::BubbleDialogDelegateView* bubble = container->active_bubble(); | 77 views::BubbleDialogDelegateView* bubble = container->active_bubble(); |
| 77 views::View* anchor_view = nullptr; | 78 views::View* anchor_view = nullptr; |
| 78 switch (anchor) { | 79 switch (anchor) { |
| 79 case ANCHOR_BROWSER_ACTION: | 80 case ANCHOR_BROWSER_ACTION: |
| 80 DCHECK_GT(container->num_toolbar_actions(), 0u); | 81 DCHECK_GT(container->num_toolbar_actions(), 0u); |
| 81 anchor_view = container->GetToolbarActionViewAt(0); | 82 anchor_view = container->GetToolbarActionViewAt(0); |
| 82 break; | 83 break; |
| 83 case ANCHOR_APP_MENU: | 84 case ANCHOR_APP_MENU: |
| 84 anchor_view = toolbar_view->app_menu_button(); | 85 anchor_view = toolbar_view->app_menu_button(); |
| 85 break; | 86 break; |
| 86 } | 87 } |
| 87 CheckBubbleAndReferenceView(bubble, anchor_view); | 88 CheckBubbleAndReferenceView(bubble, anchor_view); |
| 88 } | 89 } |
| 89 | 90 |
| 90 void ExtensionMessageBubbleViewBrowserTest::CloseBubble(Browser* browser) { | 91 void ExtensionMessageBubbleViewBrowserTest::CloseBubbleNative( |
| 92 Browser* browser) { |
| 91 BrowserActionsContainer* container = | 93 BrowserActionsContainer* container = |
| 92 GetToolbarViewForBrowser(browser)->browser_actions(); | 94 GetToolbarViewForBrowser(browser)->browser_actions(); |
| 93 views::BubbleDialogDelegateView* bubble = container->active_bubble(); | 95 views::BubbleDialogDelegateView* bubble = container->active_bubble(); |
| 94 ASSERT_TRUE(bubble); | 96 ASSERT_TRUE(bubble); |
| 95 bubble->GetWidget()->Close(); | 97 bubble->GetWidget()->Close(); |
| 96 EXPECT_EQ(nullptr, container->active_bubble()); | 98 EXPECT_EQ(nullptr, container->active_bubble()); |
| 97 } | 99 } |
| 98 | 100 |
| 99 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleIsNotPresent( | 101 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleIsNotPresentNative( |
| 100 Browser* browser) { | 102 Browser* browser) { |
| 101 EXPECT_EQ( | 103 EXPECT_EQ( |
| 102 nullptr, | 104 nullptr, |
| 103 GetToolbarViewForBrowser(browser)->browser_actions()->active_bubble()); | 105 GetToolbarViewForBrowser(browser)->browser_actions()->active_bubble()); |
| 104 } | 106 } |
| 105 | 107 |
| 106 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 108 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 107 ExtensionBubbleAnchoredToExtensionAction) { | 109 ExtensionBubbleAnchoredToExtensionAction) { |
| 108 TestBubbleAnchoredToExtensionAction(); | 110 TestBubbleAnchoredToExtensionAction(); |
| 109 } | 111 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign, | 151 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign, |
| 150 TestControlledHomeMessageBubble) { | 152 TestControlledHomeMessageBubble) { |
| 151 TestControlledHomeBubbleShown(); | 153 TestControlledHomeBubbleShown(); |
| 152 } | 154 } |
| 153 | 155 |
| 154 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign, | 156 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign, |
| 155 TestControlledSearchMessageBubble) { | 157 TestControlledSearchMessageBubble) { |
| 156 TestControlledSearchBubbleShown(); | 158 TestControlledSearchBubbleShown(); |
| 157 } | 159 } |
| 158 #endif // defined(OS_WIN) | 160 #endif // defined(OS_WIN) |
| 161 |
| 162 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 163 TestBubbleWithMultipleWindows) { |
| 164 TestBubbleWithMultipleWindows(); |
| 165 } |
| OLD | NEW |