OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/window_sizer/window_sizer_common_unittest.h" | 5 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
9 #include "ash/test/test_shell_delegate.h" | 9 #include "ash/test/test_shell_delegate.h" |
10 #include "ash/wm/window_resizer.h" | 10 #include "ash/wm/window_resizer.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
15 #include "content/public/test/render_view_test.h" | 15 #include "content/public/test/render_view_test.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
17 #include "ui/aura/client/activation_client.h" | 18 #include "ui/aura/client/activation_client.h" |
18 #include "ui/aura/client/aura_constants.h" | 19 #include "ui/aura/client/aura_constants.h" |
19 #include "ui/aura/env.h" | 20 #include "ui/aura/env.h" |
20 #include "ui/aura/root_window.h" | 21 #include "ui/aura/root_window.h" |
21 #include "ui/aura/test/test_windows.h" | 22 #include "ui/aura/test/test_windows.h" |
22 | 23 |
23 typedef ash::test::AshTestBase WindowSizerTest; | 24 typedef ash::test::AshTestBase WindowSizerTest; |
24 | 25 |
25 namespace { | 26 namespace { |
26 | 27 |
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 browser.get(), | 890 browser.get(), |
890 p1600x1200), ui::SHOW_STATE_MAXIMIZED); | 891 p1600x1200), ui::SHOW_STATE_MAXIMIZED); |
891 | 892 |
892 // The popup should favor the initial show state over the command line. | 893 // The popup should favor the initial show state over the command line. |
893 EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL, | 894 EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL, |
894 ui::SHOW_STATE_NORMAL, | 895 ui::SHOW_STATE_NORMAL, |
895 BOTH, | 896 BOTH, |
896 popup_browser.get(), | 897 popup_browser.get(), |
897 p1600x1200), ui::SHOW_STATE_NORMAL); | 898 p1600x1200), ui::SHOW_STATE_NORMAL); |
898 } | 899 } |
OLD | NEW |