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

Side by Side Diff: ash/shell.cc

Issue 2697043004: Makes Shell::SetDisplayWorkAreaInsets() call to WmShell (Closed)
Patch Set: 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
« ash/aura/wm_shell_aura.cc ('K') | « ash/aura/wm_shell_aura.cc ('k') | no next file » | 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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 267 }
268 268
269 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( 269 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
270 views::Widget* widget) { 270 views::Widget* widget) {
271 // Use translucent-style window frames for dialogs. 271 // Use translucent-style window frames for dialogs.
272 return new CustomFrameViewAsh(widget); 272 return new CustomFrameViewAsh(widget);
273 } 273 }
274 274
275 void Shell::SetDisplayWorkAreaInsets(Window* contains, 275 void Shell::SetDisplayWorkAreaInsets(Window* contains,
276 const gfx::Insets& insets) { 276 const gfx::Insets& insets) {
277 if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow( 277 wm_shell_->SetDisplayWorkAreaInsets(WmWindow::Get(contains), insets);
msw 2017/02/16 18:34:49 It's a bit odd to do Shell->WmShell->Shell, but it
sky 2017/02/16 18:42:20 Acknowledged.
278 contains, insets)) {
279 return;
280 }
281 } 278 }
282 279
283 void Shell::OnLoginStateChanged(LoginStatus status) { 280 void Shell::OnLoginStateChanged(LoginStatus status) {
284 for (auto& observer : *wm_shell_->shell_observers()) 281 for (auto& observer : *wm_shell_->shell_observers())
285 observer.OnLoginStateChanged(status); 282 observer.OnLoginStateChanged(status);
286 } 283 }
287 284
288 void Shell::OnAppTerminating() { 285 void Shell::OnAppTerminating() {
289 for (auto& observer : *wm_shell_->shell_observers()) 286 for (auto& observer : *wm_shell_->shell_observers())
290 observer.OnAppTerminating(); 287 observer.OnAppTerminating();
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 935 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
939 return std::unique_ptr<ui::EventTargetIterator>(); 936 return std::unique_ptr<ui::EventTargetIterator>();
940 } 937 }
941 938
942 ui::EventTargeter* Shell::GetEventTargeter() { 939 ui::EventTargeter* Shell::GetEventTargeter() {
943 NOTREACHED(); 940 NOTREACHED();
944 return nullptr; 941 return nullptr;
945 } 942 }
946 943
947 } // namespace ash 944 } // namespace ash
OLDNEW
« ash/aura/wm_shell_aura.cc ('K') | « ash/aura/wm_shell_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698