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

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

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 9 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 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/common/shelf/wm_shelf.h" 5 #include "ash/common/shelf/wm_shelf.h"
6 6
7 #include "ash/common/shelf/shelf_controller.h" 7 #include "ash/common/shelf/shelf_controller.h"
8 #include "ash/common/shelf/shelf_delegate.h" 8 #include "ash/common/shelf/shelf_delegate.h"
9 #include "ash/common/shelf/shelf_item_delegate.h" 9 #include "ash/common/shelf/shelf_item_delegate.h"
10 #include "ash/common/shelf/shelf_layout_manager.h" 10 #include "ash/common/shelf/shelf_layout_manager.h"
11 #include "ash/common/shelf/shelf_locking_manager.h" 11 #include "ash/common/shelf/shelf_locking_manager.h"
12 #include "ash/common/shelf/shelf_model.h" 12 #include "ash/common/shelf/shelf_model.h"
13 #include "ash/common/shelf/shelf_widget.h" 13 #include "ash/common/shelf/shelf_widget.h"
14 #include "ash/common/shelf/wm_shelf_observer.h" 14 #include "ash/common/shelf/wm_shelf_observer.h"
15 #include "ash/common/system/tray/system_tray_delegate.h" 15 #include "ash/common/system/tray/system_tray_delegate.h"
16 #include "ash/common/wm_lookup.h"
17 #include "ash/common/wm_shell.h" 16 #include "ash/common/wm_shell.h"
18 #include "ash/common/wm_window.h" 17 #include "ash/common/wm_window.h"
19 #include "ash/public/cpp/shell_window_ids.h" 18 #include "ash/public/cpp/shell_window_ids.h"
20 #include "ash/root_window_controller.h" 19 #include "ash/root_window_controller.h"
21 #include "ash/shelf/shelf_bezel_event_handler.h" 20 #include "ash/shelf/shelf_bezel_event_handler.h"
22 #include "ash/shell.h" 21 #include "ash/shell.h"
23 #include "base/logging.h" 22 #include "base/logging.h"
24 #include "base/memory/ptr_util.h" 23 #include "base/memory/ptr_util.h"
25 #include "ui/aura/env.h" 24 #include "ui/aura/env.h"
26 #include "ui/display/types/display_constants.h" 25 #include "ui/display/types/display_constants.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 DCHECK(shelf_view_); 140 DCHECK(shelf_view_);
142 shelf_locking_manager_.reset(); 141 shelf_locking_manager_.reset();
143 shelf_view_ = nullptr; 142 shelf_view_ = nullptr;
144 } 143 }
145 144
146 bool WmShelf::IsShelfInitialized() const { 145 bool WmShelf::IsShelfInitialized() const {
147 return !!shelf_view_; 146 return !!shelf_view_;
148 } 147 }
149 148
150 WmWindow* WmShelf::GetWindow() { 149 WmWindow* WmShelf::GetWindow() {
151 return WmLookup::Get()->GetWindowForWidget(shelf_widget_.get()); 150 return WmWindow::Get(shelf_widget_->GetNativeWindow());
152 } 151 }
153 152
154 void WmShelf::SetAlignment(ShelfAlignment alignment) { 153 void WmShelf::SetAlignment(ShelfAlignment alignment) {
155 DCHECK(shelf_layout_manager_); 154 DCHECK(shelf_layout_manager_);
156 DCHECK(shelf_locking_manager_); 155 DCHECK(shelf_locking_manager_);
157 156
158 if (alignment_ == alignment) 157 if (alignment_ == alignment)
159 return; 158 return;
160 159
161 if (shelf_locking_manager_->is_locked() && 160 if (shelf_locking_manager_->is_locked() &&
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 366
368 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, 367 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
369 AnimationChangeType change_type) { 368 AnimationChangeType change_type) {
370 if (background_type == GetBackgroundType()) 369 if (background_type == GetBackgroundType())
371 return; 370 return;
372 for (auto& observer : observers_) 371 for (auto& observer : observers_)
373 observer.OnBackgroundTypeChanged(background_type, change_type); 372 observer.OnBackgroundTypeChanged(background_type, change_type);
374 } 373 }
375 374
376 } // namespace ash 375 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_window_watcher_unittest.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698