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

Side by Side Diff: ash/root_window_controller.cc

Issue 11434099: Use the correct launcher assets for shelf alignment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clean up Created 8 years 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 | Annotate | Revision Log
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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/desktop_background/desktop_background_widget_controller.h" 10 #include "ash/desktop_background/desktop_background_widget_controller.h"
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 476
477 ShelfAutoHideBehavior RootWindowController::GetShelfAutoHideBehavior() const { 477 ShelfAutoHideBehavior RootWindowController::GetShelfAutoHideBehavior() const {
478 return shelf_->auto_hide_behavior(); 478 return shelf_->auto_hide_behavior();
479 } 479 }
480 480
481 bool RootWindowController::SetShelfAlignment(ShelfAlignment alignment) { 481 bool RootWindowController::SetShelfAlignment(ShelfAlignment alignment) {
482 return shelf_->SetAlignment(alignment); 482 return shelf_->SetAlignment(alignment);
483 } 483 }
484 484
485 ShelfAlignment RootWindowController::GetShelfAlignment() { 485 ShelfAlignment RootWindowController::GetShelfAlignment() {
486 return shelf_->alignment(); 486 return shelf_->GetAlignment();
487 } 487 }
488 488
489 bool RootWindowController::IsShelfAutoHideMenuHideChecked() { 489 bool RootWindowController::IsShelfAutoHideMenuHideChecked() {
490 return GetShelfAutoHideBehavior() == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS; 490 return GetShelfAutoHideBehavior() == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
491 } 491 }
492 492
493 ShelfAutoHideBehavior 493 ShelfAutoHideBehavior
494 RootWindowController::GetToggledShelfAutoHideBehavior() { 494 RootWindowController::GetToggledShelfAutoHideBehavior() {
495 return IsShelfAutoHideMenuHideChecked() ? 495 return IsShelfAutoHideMenuHideChecked() ?
496 ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER : 496 ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER :
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 "OverlayContainer", 651 "OverlayContainer",
652 lock_screen_related_containers); 652 lock_screen_related_containers);
653 SetUsesScreenCoordinates(overlay_container); 653 SetUsesScreenCoordinates(overlay_container);
654 654
655 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 655 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
656 "PowerButtonAnimationContainer", root_window) ; 656 "PowerButtonAnimationContainer", root_window) ;
657 } 657 }
658 658
659 } // namespace internal 659 } // namespace internal
660 } // namespace ash 660 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698