| 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 "build/build_config.h" |
| 7 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
| 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 9 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
| 10 #include "ui/views/focus/focus_manager.h" | 11 #include "ui/views/focus/focus_manager.h" |
| 11 | 12 |
| 12 #if defined(USE_AURA) | 13 #if defined(USE_AURA) |
| 13 #include "chrome/browser/ui/browser_window_state.h" | 14 #include "chrome/browser/ui/browser_window_state.h" |
| 14 #include "ui/aura/client/aura_constants.h" | 15 #include "ui/aura/client/aura_constants.h" |
| 15 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 16 #include "ui/aura/window_delegate.h" | 17 #include "ui/aura/window_delegate.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 window = browser->window()->GetNativeWindow(); | 148 window = browser->window()->GetNativeWindow(); |
| 148 EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString()); | 149 EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString()); |
| 149 EXPECT_EQ(ui::SHOW_STATE_NORMAL, | 150 EXPECT_EQ(ui::SHOW_STATE_NORMAL, |
| 150 window->GetProperty(aura::client::kShowStateKey)); | 151 window->GetProperty(aura::client::kShowStateKey)); |
| 151 } | 152 } |
| 152 | 153 |
| 153 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp, | 154 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp, |
| 154 BrowserViewTestParam, | 155 BrowserViewTestParam, |
| 155 testing::Bool()); | 156 testing::Bool()); |
| 156 #endif | 157 #endif |
| OLD | NEW |