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

Side by Side Diff: ash/shelf/shelf.cc

Issue 2915553004: mash: Remove last WmWindow uses in ash/shelf. (Closed)
Patch Set: Created 3 years, 6 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/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_controller.cc » ('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/shelf/shelf.h" 5 #include "ash/shelf/shelf.h"
6 6
7 #include "ash/public/cpp/config.h" 7 #include "ash/public/cpp/config.h"
8 #include "ash/public/cpp/shelf_item_delegate.h" 8 #include "ash/public/cpp/shelf_item_delegate.h"
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
11 #include "ash/session/session_controller.h" 11 #include "ash/session/session_controller.h"
12 #include "ash/shelf/shelf_bezel_event_handler.h" 12 #include "ash/shelf/shelf_bezel_event_handler.h"
13 #include "ash/shelf/shelf_controller.h" 13 #include "ash/shelf/shelf_controller.h"
14 #include "ash/shelf/shelf_layout_manager.h" 14 #include "ash/shelf/shelf_layout_manager.h"
15 #include "ash/shelf/shelf_model.h" 15 #include "ash/shelf/shelf_model.h"
16 #include "ash/shelf/shelf_observer.h" 16 #include "ash/shelf/shelf_observer.h"
17 #include "ash/shelf/shelf_widget.h" 17 #include "ash/shelf/shelf_widget.h"
18 #include "ash/shell.h" 18 #include "ash/shell.h"
19 #include "ash/wm_window.h"
20 #include "base/logging.h" 19 #include "base/logging.h"
21 #include "base/memory/ptr_util.h" 20 #include "base/memory/ptr_util.h"
22 #include "ui/display/types/display_constants.h" 21 #include "ui/display/types/display_constants.h"
23 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
24 23
25 namespace ash { 24 namespace ash {
26 25
27 namespace { 26 namespace {
28 27
29 // A callback that does nothing after shelf item selection handling. 28 // A callback that does nothing after shelf item selection handling.
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 357
359 void Shelf::OnBackgroundUpdated(ShelfBackgroundType background_type, 358 void Shelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
360 AnimationChangeType change_type) { 359 AnimationChangeType change_type) {
361 if (background_type == GetBackgroundType()) 360 if (background_type == GetBackgroundType())
362 return; 361 return;
363 for (auto& observer : observers_) 362 for (auto& observer : observers_)
364 observer.OnBackgroundTypeChanged(background_type, change_type); 363 observer.OnBackgroundTypeChanged(background_type, change_type);
365 } 364 }
366 365
367 } // namespace ash 366 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698