| 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/views/frame/browser_frame_aura.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_aura.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 10 #include "grit/chromium_strings.h" | 10 #include "grit/chromium_strings.h" |
| 11 #include "grit/generated_resources.h" | 11 #include "grit/generated_resources.h" |
| 12 #include "ui/aura/client/aura_constants.h" | 12 #include "ui/aura/client/aura_constants.h" |
| 13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 14 #include "ui/aura/window_observer.h" | 14 #include "ui/aura/window_observer.h" |
| 15 #include "ui/base/hit_test.h" | 15 #include "ui/base/hit_test.h" |
| 16 #include "ui/base/l10n/l10n_util.h" | 16 #include "ui/base/l10n/l10n_util.h" |
| 17 #include "ui/gfx/font.h" | 17 #include "ui/gfx/font.h" |
| 18 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
| 19 | 19 |
| 20 #if defined(USE_ASH) | 20 #if defined(USE_ASH) |
| 21 #include "ash/wm/window_settings.h" | 21 #include "ash/wm/window_state.h" |
| 22 #include "ash/wm/window_util.h" | 22 #include "ash/wm/window_util.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 using aura::Window; | 25 using aura::Window; |
| 26 | 26 |
| 27 //////////////////////////////////////////////////////////////////////////////// | 27 //////////////////////////////////////////////////////////////////////////////// |
| 28 // BrowserFrameAura::WindowPropertyWatcher | 28 // BrowserFrameAura::WindowPropertyWatcher |
| 29 | 29 |
| 30 class BrowserFrameAura::WindowPropertyWatcher : public aura::WindowObserver { | 30 class BrowserFrameAura::WindowPropertyWatcher : public aura::WindowObserver { |
| 31 public: | 31 public: |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 /////////////////////////////////////////////////////////////////////////////// | 161 /////////////////////////////////////////////////////////////////////////////// |
| 162 // BrowserFrameAura, private: | 162 // BrowserFrameAura, private: |
| 163 | 163 |
| 164 BrowserFrameAura::~BrowserFrameAura() { | 164 BrowserFrameAura::~BrowserFrameAura() { |
| 165 } | 165 } |
| 166 | 166 |
| 167 void BrowserFrameAura::SetWindowAutoManaged() { | 167 void BrowserFrameAura::SetWindowAutoManaged() { |
| 168 #if defined(USE_ASH) | 168 #if defined(USE_ASH) |
| 169 if (browser_view_->browser()->type() != Browser::TYPE_POPUP || | 169 if (browser_view_->browser()->type() != Browser::TYPE_POPUP || |
| 170 browser_view_->browser()->is_app()) { | 170 browser_view_->browser()->is_app()) { |
| 171 ash::wm::GetWindowSettings(GetNativeWindow())-> | 171 ash::wm::GetWindowState(GetNativeWindow())-> |
| 172 set_window_position_managed(true); | 172 set_window_position_managed(true); |
| 173 } | 173 } |
| 174 #endif | 174 #endif |
| 175 } | 175 } |
| OLD | NEW |