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

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: rebase 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
« no previous file with comments | « ash/launcher/tabbed_launcher_button.cc ('k') | ash/wm/app_list_controller.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 (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 //////////////////////////////////////////////////////////////////////////////// 489 ////////////////////////////////////////////////////////////////////////////////
490 // RootWindowController, private: 490 // RootWindowController, private:
491 491
492 void RootWindowController::CreateContainersInRootWindow( 492 void RootWindowController::CreateContainersInRootWindow(
493 aura::RootWindow* root_window) { 493 aura::RootWindow* root_window) {
494 // These containers are just used by PowerButtonController to animate groups 494 // These containers are just used by PowerButtonController to animate groups
495 // of containers simultaneously without messing up the current transformations 495 // of containers simultaneously without messing up the current transformations
496 // on those containers. These are direct children of the root window; all of 496 // on those containers. These are direct children of the root window; all of
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 "OverlayContainer", 640 "OverlayContainer",
641 lock_screen_related_containers); 641 lock_screen_related_containers);
642 SetUsesScreenCoordinates(overlay_container); 642 SetUsesScreenCoordinates(overlay_container);
643 643
644 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 644 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
645 "PowerButtonAnimationContainer", root_window) ; 645 "PowerButtonAnimationContainer", root_window) ;
646 } 646 }
647 647
648 } // namespace internal 648 } // namespace internal
649 } // namespace ash 649 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/tabbed_launcher_button.cc ('k') | ash/wm/app_list_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698