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

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

Issue 14222019: Trying to activate a window in a workspace other than the current is ignored while a system modal d… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 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 (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 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 487
488 void ShelfLayoutManager::OnLockStateChanged(bool locked) { 488 void ShelfLayoutManager::OnLockStateChanged(bool locked) {
489 UpdateVisibilityState(); 489 UpdateVisibilityState();
490 } 490 }
491 491
492 void ShelfLayoutManager::OnWindowActivated(aura::Window* gained_active, 492 void ShelfLayoutManager::OnWindowActivated(aura::Window* gained_active,
493 aura::Window* lost_active) { 493 aura::Window* lost_active) {
494 UpdateAutoHideStateNow(); 494 UpdateAutoHideStateNow();
495 } 495 }
496 496
497 void ShelfLayoutManager::OnWindowActivationRequestCompleted(
498 aura::Window* request_active, aura::Window* actual_active) {
499 }
500
497 bool ShelfLayoutManager::IsHorizontalAlignment() const { 501 bool ShelfLayoutManager::IsHorizontalAlignment() const {
498 return alignment_ == SHELF_ALIGNMENT_BOTTOM || 502 return alignment_ == SHELF_ALIGNMENT_BOTTOM ||
499 alignment_ == SHELF_ALIGNMENT_TOP; 503 alignment_ == SHELF_ALIGNMENT_TOP;
500 } 504 }
501 505
502 // static 506 // static
503 ShelfLayoutManager* ShelfLayoutManager::ForLauncher(aura::Window* window) { 507 ShelfLayoutManager* ShelfLayoutManager::ForLauncher(aura::Window* window) {
504 ShelfWidget* shelf = RootWindowController::ForLauncher(window)->shelf(); 508 ShelfWidget* shelf = RootWindowController::ForLauncher(window)->shelf();
505 return shelf ? shelf->shelf_layout_manager() : NULL; 509 return shelf ? shelf->shelf_layout_manager() : NULL;
506 } 510 }
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const { 912 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
909 if (state.visibility_state == SHELF_VISIBLE) 913 if (state.visibility_state == SHELF_VISIBLE)
910 return size; 914 return size;
911 if (state.visibility_state == SHELF_AUTO_HIDE) 915 if (state.visibility_state == SHELF_AUTO_HIDE)
912 return kAutoHideSize; 916 return kAutoHideSize;
913 return 0; 917 return 0;
914 } 918 }
915 919
916 } // namespace internal 920 } // namespace internal
917 } // namespace ash 921 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698