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

Side by Side Diff: ash/wm/window_util.cc

Issue 10223014: Revert 133982 because it broke build on chromeos due to mid-air collision with 133961. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/window_util.h ('k') | ash/wm/workspace/snap_sizer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ash/wm/window_util.h" 5 #include "ash/wm/window_util.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/activation_controller.h" 8 #include "ash/wm/activation_controller.h"
9 #include "ui/aura/client/activation_client.h" 9 #include "ui/aura/client/activation_client.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
11 #include "ui/aura/env.h"
12 #include "ui/aura/monitor.h"
13 #include "ui/aura/monitor_manager.h"
14 #include "ui/aura/root_window.h" 11 #include "ui/aura/root_window.h"
15 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
16 #include "ui/aura/window_property.h" 13 #include "ui/aura/window_property.h"
17 #include "ui/base/ui_base_types.h" 14 #include "ui/base/ui_base_types.h"
18 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
19 16
20 DECLARE_WINDOW_PROPERTY_TYPE(bool); 17 DECLARE_WINDOW_PROPERTY_TYPE(bool);
21 18
22 namespace ash { 19 namespace ash {
23 DEFINE_WINDOW_PROPERTY_KEY(bool, kOpenWindowSplitKey, false); 20 DEFINE_WINDOW_PROPERTY_KEY(bool, kOpenWindowSplitKey, false);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 89 }
93 90
94 void MinimizeWindow(aura::Window* window) { 91 void MinimizeWindow(aura::Window* window) {
95 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED); 92 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
96 } 93 }
97 94
98 void RestoreWindow(aura::Window* window) { 95 void RestoreWindow(aura::Window* window) {
99 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); 96 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
100 } 97 }
101 98
102 void CenterWindow(aura::Window* window) {
103 const aura::Monitor* monitor = aura::Env::GetInstance()->monitor_manager()->
104 GetMonitorNearestWindow(window);
105 gfx::Rect center = monitor->GetWorkAreaBounds().Center(
106 window->bounds().size());
107 window->SetBounds(center);
108 }
109
110 } // namespace wm 99 } // namespace wm
111 } // namespace ash 100 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_util.h ('k') | ash/wm/workspace/snap_sizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698