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/browser_frame_ash.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/window_properties.h" | 8 #include "ash/wm/window_properties.h" |
9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
10 #include "ash/wm/window_state_delegate.h" | 10 #include "ash/wm/window_state_delegate.h" |
11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
| 12 #include "base/macros.h" |
| 13 #include "build/build_config.h" |
12 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
13 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
14 #include "chrome/browser/ui/views/frame/browser_shutdown.h" | 16 #include "chrome/browser/ui/views/frame/browser_shutdown.h" |
15 #include "chrome/browser/ui/views/frame/browser_view.h" | 17 #include "chrome/browser/ui/views/frame/browser_view.h" |
16 #include "ui/aura/client/aura_constants.h" | 18 #include "ui/aura/client/aura_constants.h" |
17 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
18 #include "ui/aura/window_observer.h" | 20 #include "ui/aura/window_observer.h" |
19 #include "ui/views/view.h" | 21 #include "ui/views/view.h" |
20 | 22 |
21 namespace { | 23 namespace { |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 /////////////////////////////////////////////////////////////////////////////// | 173 /////////////////////////////////////////////////////////////////////////////// |
172 // BrowserFrameAsh, private: | 174 // BrowserFrameAsh, private: |
173 | 175 |
174 void BrowserFrameAsh::SetWindowAutoManaged() { | 176 void BrowserFrameAsh::SetWindowAutoManaged() { |
175 if (!browser_view_->browser()->is_type_popup() || | 177 if (!browser_view_->browser()->is_type_popup() || |
176 browser_view_->browser()->is_app()) { | 178 browser_view_->browser()->is_app()) { |
177 ash::wm::GetWindowState(GetNativeWindow())-> | 179 ash::wm::GetWindowState(GetNativeWindow())-> |
178 set_window_position_managed(true); | 180 set_window_position_managed(true); |
179 } | 181 } |
180 } | 182 } |
OLD | NEW |