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

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

Issue 2690563005: cros: Disable the auto management logic for v1app browser window (Closed)
Patch Set: scope tests to OS_CHROMEOS Created 3 years, 10 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/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm/window_state_delegate.h" 9 #include "ash/common/wm/window_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 return 0; 171 return 0;
172 } 172 }
173 173
174 BrowserFrameAsh::~BrowserFrameAsh() { 174 BrowserFrameAsh::~BrowserFrameAsh() {
175 } 175 }
176 176
177 /////////////////////////////////////////////////////////////////////////////// 177 ///////////////////////////////////////////////////////////////////////////////
178 // BrowserFrameAsh, private: 178 // BrowserFrameAsh, private:
179 179
180 void BrowserFrameAsh::SetWindowAutoManaged() { 180 void BrowserFrameAsh::SetWindowAutoManaged() {
181 if (!browser_view_->browser()->is_type_popup() || 181 // For browser window in Chrome OS, we should only enable the auto window
182 browser_view_->browser()->is_app()) { 182 // management logic for tabbed browser.
183 ash::wm::GetWindowState(GetNativeWindow())-> 183 if (!browser_view_->browser()->is_type_popup()) {
184 set_window_position_managed(true); 184 ash::wm::GetWindowState(GetNativeWindow())
185 ->set_window_position_managed(true);
185 } 186 }
186 } 187 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698