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

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2225083003: mash: Add WmShell::SetDisplayWorkAreaInsets for ShelfLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nits; fix bad argument. Created 4 years, 4 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
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/wm_shell.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 105 }
106 106
107 bool WmShellAura::IsInUnifiedMode() const { 107 bool WmShellAura::IsInUnifiedMode() const {
108 return Shell::GetInstance()->display_manager()->IsInUnifiedMode(); 108 return Shell::GetInstance()->display_manager()->IsInUnifiedMode();
109 } 109 }
110 110
111 bool WmShellAura::IsForceMaximizeOnFirstRun() { 111 bool WmShellAura::IsForceMaximizeOnFirstRun() {
112 return delegate()->IsForceMaximizeOnFirstRun(); 112 return delegate()->IsForceMaximizeOnFirstRun();
113 } 113 }
114 114
115 void WmShellAura::SetDisplayWorkAreaInsets(WmWindow* window,
116 const gfx::Insets& insets) {
117 aura::Window* aura_window = WmWindowAura::GetAuraWindow(window);
118 Shell::GetInstance()->SetDisplayWorkAreaInsets(aura_window, insets);
119 }
120
115 bool WmShellAura::IsPinned() { 121 bool WmShellAura::IsPinned() {
116 return Shell::GetInstance()->screen_pinning_controller()->IsPinned(); 122 return Shell::GetInstance()->screen_pinning_controller()->IsPinned();
117 } 123 }
118 124
119 void WmShellAura::SetPinnedWindow(WmWindow* window) { 125 void WmShellAura::SetPinnedWindow(WmWindow* window) {
120 return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow( 126 return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow(
121 window); 127 window);
122 } 128 }
123 129
124 bool WmShellAura::CanShowWindowForUser(WmWindow* window) { 130 bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 278 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
273 OnDisplayConfigurationChanging()); 279 OnDisplayConfigurationChanging());
274 } 280 }
275 281
276 void WmShellAura::OnDisplayConfigurationChanged() { 282 void WmShellAura::OnDisplayConfigurationChanged() {
277 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 283 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
278 OnDisplayConfigurationChanged()); 284 OnDisplayConfigurationChanged());
279 } 285 }
280 286
281 } // namespace ash 287 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698