| OLD | NEW |
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
| 10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "ui/views/focus/focus_manager.h" | 12 #include "ui/views/focus/focus_manager.h" |
| 13 | 13 |
| 14 #if defined(USE_ASH) | 14 #if defined(USE_ASH) |
| 15 #include "ash/common/ash_switches.h" | 15 #include "ash/ash_switches.h" |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 #if defined(USE_AURA) | 18 #if defined(USE_AURA) |
| 19 #include "chrome/browser/ui/browser_window_state.h" | 19 #include "chrome/browser/ui/browser_window_state.h" |
| 20 #include "ui/aura/client/aura_constants.h" | 20 #include "ui/aura/client/aura_constants.h" |
| 21 #include "ui/aura/window_delegate.h" | 21 #include "ui/aura/window_delegate.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 using views::FocusManager; | 24 using views::FocusManager; |
| 25 | 25 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // Newly created browser should retain undocked state. | 123 // Newly created browser should retain undocked state. |
| 124 window = browser->window()->GetNativeWindow(); | 124 window = browser->window()->GetNativeWindow(); |
| 125 EXPECT_EQ(ui::SHOW_STATE_NORMAL, | 125 EXPECT_EQ(ui::SHOW_STATE_NORMAL, |
| 126 window->GetProperty(aura::client::kShowStateKey)); | 126 window->GetProperty(aura::client::kShowStateKey)); |
| 127 } | 127 } |
| 128 | 128 |
| 129 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp, | 129 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp, |
| 130 BrowserViewTestParam, | 130 BrowserViewTestParam, |
| 131 testing::Bool()); | 131 testing::Bool()); |
| 132 #endif | 132 #endif |
| OLD | NEW |