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

Side by Side Diff: ash/shell.cc

Issue 10701051: Polish launcher tooltip visibility (2nd try). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add the _unittest.cc file itself Created 8 years, 5 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 | 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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked)); 614 FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked));
615 } 615 }
616 616
617 void Shell::CreateLauncher() { 617 void Shell::CreateLauncher() {
618 if (launcher_.get()) 618 if (launcher_.get())
619 return; 619 return;
620 620
621 aura::Window* default_container = 621 aura::Window* default_container =
622 GetPrimaryRootWindowController()-> 622 GetPrimaryRootWindowController()->
623 GetContainer(internal::kShellWindowId_DefaultContainer); 623 GetContainer(internal::kShellWindowId_DefaultContainer);
624 launcher_.reset(new Launcher(default_container)); 624 launcher_.reset(new Launcher(default_container, shelf_));
625 625
626 launcher_->SetFocusCycler(focus_cycler_.get()); 626 launcher_->SetFocusCycler(focus_cycler_.get());
627 shelf_->SetLauncher(launcher_.get()); 627 shelf_->SetLauncher(launcher_.get());
628 if (panel_layout_manager_) 628 if (panel_layout_manager_)
629 panel_layout_manager_->SetLauncher(launcher_.get()); 629 panel_layout_manager_->SetLauncher(launcher_.get());
630 630
631 launcher_->widget()->Show(); 631 launcher_->widget()->Show();
632 } 632 }
633 633
634 void Shell::AddShellObserver(ShellObserver* observer) { 634 void Shell::AddShellObserver(ShellObserver* observer) {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 } 788 }
789 789
790 void Shell::ShowCursor(bool visible) { 790 void Shell::ShowCursor(bool visible) {
791 RootWindowList root_windows = GetAllRootWindows(); 791 RootWindowList root_windows = GetAllRootWindows();
792 for (RootWindowList::iterator iter = root_windows.begin(); 792 for (RootWindowList::iterator iter = root_windows.begin();
793 iter != root_windows.end(); ++iter) 793 iter != root_windows.end(); ++iter)
794 (*iter)->ShowCursor(visible); 794 (*iter)->ShowCursor(visible);
795 } 795 }
796 796
797 } // namespace ash 797 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698