| 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 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" | 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 | 817 |
| 818 private: | 818 private: |
| 819 // Not owned. | 819 // Not owned. |
| 820 ImmersiveModeControllerAsh* controller_; | 820 ImmersiveModeControllerAsh* controller_; |
| 821 | 821 |
| 822 DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestWithBrowserView); | 822 DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestWithBrowserView); |
| 823 }; | 823 }; |
| 824 | 824 |
| 825 // Test the layout and visibility of the tabstrip, toolbar and TopContainerView | 825 // Test the layout and visibility of the tabstrip, toolbar and TopContainerView |
| 826 // in immersive fullscreen. | 826 // in immersive fullscreen. |
| 827 TEST_F(ImmersiveModeControllerAshTestWithBrowserView, Layout) { | 827 // Flaky. See http://crbug.com/302908 . |
| 828 TEST_F(ImmersiveModeControllerAshTestWithBrowserView, DISABLED_Layout) { |
| 828 AddTab(browser(), GURL("about:blank")); | 829 AddTab(browser(), GURL("about:blank")); |
| 829 | 830 |
| 830 TabStrip* tabstrip = browser_view()->tabstrip(); | 831 TabStrip* tabstrip = browser_view()->tabstrip(); |
| 831 ToolbarView* toolbar = browser_view()->toolbar(); | 832 ToolbarView* toolbar = browser_view()->toolbar(); |
| 832 views::WebView* contents_web_view = | 833 views::WebView* contents_web_view = |
| 833 browser_view()->GetContentsWebViewForTest(); | 834 browser_view()->GetContentsWebViewForTest(); |
| 834 | 835 |
| 835 // Immersive fullscreen starts out disabled. | 836 // Immersive fullscreen starts out disabled. |
| 836 ASSERT_FALSE(browser_view()->GetWidget()->IsFullscreen()); | 837 ASSERT_FALSE(browser_view()->GetWidget()->IsFullscreen()); |
| 837 ASSERT_FALSE(controller()->IsEnabled()); | 838 ASSERT_FALSE(controller()->IsEnabled()); |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 | 960 |
| 960 browser_view()->GetWidget()->Restore(); | 961 browser_view()->GetWidget()->Restore(); |
| 961 // Exiting immersive fullscreen occurs as a result of a task posted to the | 962 // Exiting immersive fullscreen occurs as a result of a task posted to the |
| 962 // message loop. | 963 // message loop. |
| 963 content::RunAllPendingInMessageLoop(); | 964 content::RunAllPendingInMessageLoop(); |
| 964 | 965 |
| 965 EXPECT_FALSE(controller()->IsEnabled()); | 966 EXPECT_FALSE(controller()->IsEnabled()); |
| 966 } | 967 } |
| 967 | 968 |
| 968 #endif // defined(OS_CHROMEOS) | 969 #endif // defined(OS_CHROMEOS) |
| OLD | NEW |