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

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

Issue 2904073002: [mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h (removes unneeded header) Created 3 years, 7 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/shelf_layout_manager.h ('k') | ash/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 (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/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 ((shelf_widget_->GetNativeWindow() == child) || 404 ((shelf_widget_->GetNativeWindow() == child) ||
405 (shelf_widget_->status_area_widget()->GetNativeWindow() == child))) { 405 (shelf_widget_->status_area_widget()->GetNativeWindow() == child))) {
406 LayoutShelf(); 406 LayoutShelf();
407 } 407 }
408 } 408 }
409 409
410 void ShelfLayoutManager::OnShelfAutoHideBehaviorChanged(WmWindow* root_window) { 410 void ShelfLayoutManager::OnShelfAutoHideBehaviorChanged(WmWindow* root_window) {
411 UpdateVisibilityState(); 411 UpdateVisibilityState();
412 } 412 }
413 413
414 void ShelfLayoutManager::OnPinnedStateChanged(WmWindow* pinned_window) { 414 void ShelfLayoutManager::OnPinnedStateChanged(aura::Window* pinned_window) {
415 // Shelf needs to be hidden on entering to pinned mode, or restored 415 // Shelf needs to be hidden on entering to pinned mode, or restored
416 // on exiting from pinned mode. 416 // on exiting from pinned mode.
417 UpdateVisibilityState(); 417 UpdateVisibilityState();
418 } 418 }
419 419
420 void ShelfLayoutManager::OnVirtualKeyboardStateChanged( 420 void ShelfLayoutManager::OnVirtualKeyboardStateChanged(
421 bool activated, 421 bool activated,
422 aura::Window* root_window) { 422 aura::Window* root_window) {
423 UpdateKeyboardObserverFromStateChanged( 423 UpdateKeyboardObserverFromStateChanged(
424 activated, root_window, shelf_widget_->GetNativeWindow()->GetRootWindow(), 424 activated, root_window, shelf_widget_->GetNativeWindow()->GetRootWindow(),
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 gesture_drag_status_ = GESTURE_DRAG_NONE; 1154 gesture_drag_status_ = GESTURE_DRAG_NONE;
1155 } 1155 }
1156 1156
1157 void ShelfLayoutManager::CancelGestureDrag() { 1157 void ShelfLayoutManager::CancelGestureDrag() {
1158 gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS; 1158 gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS;
1159 UpdateVisibilityState(); 1159 UpdateVisibilityState();
1160 gesture_drag_status_ = GESTURE_DRAG_NONE; 1160 gesture_drag_status_ = GESTURE_DRAG_NONE;
1161 } 1161 }
1162 1162
1163 } // namespace ash 1163 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698