Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_ash.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm/window_properties.h" 9 #include "ash/wm/window_properties.h"
10 #include "ash/wm/window_state.h" 10 #include "ash/wm/window_state.h"
11 #include "ash/wm/window_state_aura.h"
12 #include "ash/wm/window_state_delegate.h" 11 #include "ash/wm/window_state_delegate.h"
13 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
14 #include "base/macros.h" 13 #include "base/macros.h"
15 #include "build/build_config.h" 14 #include "build/build_config.h"
16 #include "chrome/browser/ui/browser_commands.h" 15 #include "chrome/browser/ui/browser_commands.h"
17 #include "chrome/browser/ui/browser_finder.h" 16 #include "chrome/browser/ui/browser_finder.h"
18 #include "chrome/browser/ui/views/frame/browser_view.h" 17 #include "chrome/browser/ui/views/frame/browser_view.h"
19 #include "ui/aura/client/aura_constants.h" 18 #include "ui/aura/client/aura_constants.h"
20 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
21 #include "ui/aura/window_observer.h" 20 #include "ui/aura/window_observer.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 // BrowserFrameAsh, private: 161 // BrowserFrameAsh, private:
163 162
164 void BrowserFrameAsh::SetWindowAutoManaged() { 163 void BrowserFrameAsh::SetWindowAutoManaged() {
165 // For browser window in Chrome OS, we should only enable the auto window 164 // For browser window in Chrome OS, we should only enable the auto window
166 // management logic for tabbed browser. 165 // management logic for tabbed browser.
167 if (!browser_view_->browser()->is_type_popup()) { 166 if (!browser_view_->browser()->is_type_popup()) {
168 ash::wm::GetWindowState(GetNativeWindow()) 167 ash::wm::GetWindowState(GetNativeWindow())
169 ->set_window_position_managed(true); 168 ->set_window_position_managed(true);
170 } 169 }
171 } 170 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698