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

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

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nits 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/common/shelf/wm_shelf.h ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.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/common/shelf/wm_shelf.h" 5 #include "ash/common/shelf/wm_shelf.h"
6 #include "ash/common/shelf/wm_shelf_observer.h" 6 #include "ash/common/shelf/wm_shelf_observer.h"
7 #include "ash/common/wm_lookup.h" 7 #include "ash/common/wm_lookup.h"
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 } 154 }
155 155
156 void WmShelf::RemoveObserver(WmShelfObserver* observer) { 156 void WmShelf::RemoveObserver(WmShelfObserver* observer) {
157 observers_.RemoveObserver(observer); 157 observers_.RemoveObserver(observer);
158 } 158 }
159 159
160 void WmShelf::NotifyShelfIconPositionsChanged() { 160 void WmShelf::NotifyShelfIconPositionsChanged() {
161 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); 161 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
162 } 162 }
163 163
164 StatusAreaWidget* WmShelf::GetStatusAreaWidget() const {
165 return shelf_layout_manager_->shelf_widget()->status_area_widget();
166 }
167
164 void WmShelf::SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds) { 168 void WmShelf::SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds) {
165 shelf_layout_manager_->OnKeyboardBoundsChanging(bounds); 169 shelf_layout_manager_->OnKeyboardBoundsChanging(bounds);
166 } 170 }
167 171
168 ShelfLockingManager* WmShelf::GetShelfLockingManagerForTesting() { 172 ShelfLockingManager* WmShelf::GetShelfLockingManagerForTesting() {
169 return shelf_->shelf_locking_manager_for_testing(); 173 return shelf_->shelf_locking_manager_for_testing();
170 } 174 }
171 175
172 ShelfView* WmShelf::GetShelfViewForTesting() { 176 ShelfView* WmShelf::GetShelfViewForTesting() {
173 return shelf_->shelf_view_for_testing(); 177 return shelf_->shelf_view_for_testing();
(...skipping 21 matching lines...) Expand all
195 199
196 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, 200 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
197 BackgroundAnimatorChangeType change_type) { 201 BackgroundAnimatorChangeType change_type) {
198 if (background_type == GetBackgroundType()) 202 if (background_type == GetBackgroundType())
199 return; 203 return;
200 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 204 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
201 OnBackgroundTypeChanged(background_type, change_type)); 205 OnBackgroundTypeChanged(background_type, change_type));
202 } 206 }
203 207
204 } // namespace ash 208 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('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