| 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/views/extensions/extension_message_bubble_view.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_view.h" | 11 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| 12 #include "ui/views/bubble/bubble_delegate.h" |
| 12 | 13 |
| 13 namespace { | 14 namespace { |
| 14 | 15 |
| 15 // Returns the ToolbarView for the given |browser|. | 16 // Returns the ToolbarView for the given |browser|. |
| 16 ToolbarView* GetToolbarViewForBrowser(Browser* browser) { | 17 ToolbarView* GetToolbarViewForBrowser(Browser* browser) { |
| 17 return BrowserView::GetBrowserViewForBrowser(browser)->toolbar(); | 18 return BrowserView::GetBrowserViewForBrowser(browser)->toolbar(); |
| 18 } | 19 } |
| 19 | 20 |
| 20 // Checks that the |bubble| is using the |expected_reference_view|, and is in | 21 // Checks that the |bubble| is using the |expected_reference_view|, and is in |
| 21 // approximately the correct position. | 22 // approximately the correct position. |
| (...skipping 23 matching lines...) Expand all Loading... |
| 45 EXPECT_TRUE(bubble->visible()); | 46 EXPECT_TRUE(bubble->visible()); |
| 46 // ... as should its Widget. | 47 // ... as should its Widget. |
| 47 EXPECT_TRUE(bubble->GetWidget()->IsVisible()); | 48 EXPECT_TRUE(bubble->GetWidget()->IsVisible()); |
| 48 } | 49 } |
| 49 | 50 |
| 50 } // namespace | 51 } // namespace |
| 51 | 52 |
| 52 class ExtensionMessageBubbleViewBrowserTest | 53 class ExtensionMessageBubbleViewBrowserTest |
| 53 : public ExtensionMessageBubbleBrowserTest { | 54 : public ExtensionMessageBubbleBrowserTest { |
| 54 protected: | 55 protected: |
| 55 ExtensionMessageBubbleViewBrowserTest() { | 56 ExtensionMessageBubbleViewBrowserTest() {} |
| 56 extensions::ExtensionMessageBubbleView:: | |
| 57 set_bubble_appearance_wait_time_for_testing(0); | |
| 58 } | |
| 59 ~ExtensionMessageBubbleViewBrowserTest() override {} | 57 ~ExtensionMessageBubbleViewBrowserTest() override {} |
| 60 | 58 |
| 61 private: | 59 private: |
| 62 // ExtensionMessageBubbleBrowserTest: | 60 // ExtensionMessageBubbleBrowserTest: |
| 63 void CheckBubble(Browser* browser, AnchorPosition anchor) override; | 61 void CheckBubble(Browser* browser, AnchorPosition anchor) override; |
| 64 void CloseBubble(Browser* browser) override; | 62 void CloseBubble(Browser* browser) override; |
| 65 void CheckBubbleIsNotPresent(Browser* browser) override; | 63 void CheckBubbleIsNotPresent(Browser* browser) override; |
| 66 | 64 |
| 67 DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest); | 65 DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest); |
| 68 }; | 66 }; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 120 |
| 123 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 121 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 124 ExtensionBubbleShowsOnStartup) { | 122 ExtensionBubbleShowsOnStartup) { |
| 125 TestBubbleShowsOnStartup(); | 123 TestBubbleShowsOnStartup(); |
| 126 } | 124 } |
| 127 | 125 |
| 128 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 126 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 129 TestUninstallDangerousExtension) { | 127 TestUninstallDangerousExtension) { |
| 130 TestUninstallDangerousExtension(); | 128 TestUninstallDangerousExtension(); |
| 131 } | 129 } |
| OLD | NEW |