| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" | 5 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" |
| 6 | 6 |
| 7 #include "chrome/browser/devtools/devtools_window.h" | 7 #include "chrome/browser/devtools/devtools_window.h" |
| 8 #include "chrome/browser/devtools/devtools_window_testing.h" |
| 8 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_list.h" | 10 #include "chrome/browser/ui/browser_list.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 11 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 12 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 12 #include "chrome/browser/ui/find_bar/find_bar.h" | 13 #include "chrome/browser/ui/find_bar/find_bar.h" |
| 13 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 14 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
| 14 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
| 15 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
| 16 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
| 17 | 18 |
| 18 class DevToolsControllerTest : public InProcessBrowserTest { | 19 class DevToolsControllerTest : public InProcessBrowserTest { |
| 19 public: | 20 public: |
| 20 DevToolsControllerTest() : InProcessBrowserTest() { | 21 DevToolsControllerTest() : InProcessBrowserTest() { |
| 21 } | 22 } |
| 22 | 23 |
| 23 virtual void SetUpOnMainThread() OVERRIDE { | 24 virtual void SetUpOnMainThread() OVERRIDE { |
| 24 DevToolsWindow::OpenDevToolsWindowForTest(browser(), true); | 25 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); |
| 25 } | 26 } |
| 26 | 27 |
| 27 private: | 28 private: |
| 28 DISALLOW_COPY_AND_ASSIGN(DevToolsControllerTest); | 29 DISALLOW_COPY_AND_ASSIGN(DevToolsControllerTest); |
| 29 }; | 30 }; |
| 30 | 31 |
| 31 // Verify that AllowOverlappingViews is set while the find bar is visible. | 32 // Verify that AllowOverlappingViews is set while the find bar is visible. |
| 32 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, AllowOverlappingViews) { | 33 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, AllowOverlappingViews) { |
| 33 content::WebContents* web_contents = | 34 content::WebContents* web_contents = |
| 34 browser()->tab_strip_model()->GetActiveWebContents(); | 35 browser()->tab_strip_model()->GetActiveWebContents(); |
| 35 content::WebContents* dev_tools = | 36 content::WebContents* dev_tools = |
| 36 DevToolsWindow::GetInTabWebContents(web_contents, NULL); | 37 DevToolsWindow::GetInTabWebContents(web_contents, NULL); |
| 37 | 38 |
| 38 // Without the find bar. | 39 // Without the find bar. |
| 39 EXPECT_TRUE(dev_tools->GetAllowOverlappingViews()); | 40 EXPECT_TRUE(dev_tools->GetAllowOverlappingViews()); |
| 40 | 41 |
| 41 // With the find bar. | 42 // With the find bar. |
| 42 browser()->GetFindBarController()->find_bar()->Show(false); | 43 browser()->GetFindBarController()->find_bar()->Show(false); |
| 43 EXPECT_TRUE(dev_tools->GetAllowOverlappingViews()); | 44 EXPECT_TRUE(dev_tools->GetAllowOverlappingViews()); |
| 44 | 45 |
| 45 // Without the find bar. | 46 // Without the find bar. |
| 46 browser()->GetFindBarController()->find_bar()->Hide(false); | 47 browser()->GetFindBarController()->find_bar()->Hide(false); |
| 47 EXPECT_TRUE(dev_tools->GetAllowOverlappingViews()); | 48 EXPECT_TRUE(dev_tools->GetAllowOverlappingViews()); |
| 48 } | 49 } |
| OLD | NEW |