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

Unified Diff: ash/launcher/launcher.cc

Issue 10701051: Polish launcher tooltip visibility (2nd try). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher.h ('k') | ash/launcher/launcher_tooltip_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher.cc
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index f8314bc3cac2767d2c5ed1d3dc7b1319c1fff1ea..bc879e7cb8f01664641280f40ccfecf6145c5fe9 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -95,7 +95,8 @@ void Launcher::DelegateView::Layout() {
// Launcher --------------------------------------------------------------------
-Launcher::Launcher(aura::Window* window_container)
+Launcher::Launcher(aura::Window* window_container,
+ internal::ShelfLayoutManager* shelf_layout_manager)
: widget_(NULL),
window_container_(window_container),
delegate_view_(NULL),
@@ -119,7 +120,8 @@ Launcher::Launcher(aura::Window* window_container)
params.parent = Shell::GetContainer(
window_container_->GetRootWindow(),
ash::internal::kShellWindowId_LauncherContainer);
- launcher_view_ = new internal::LauncherView(model_.get(), delegate_.get());
+ launcher_view_ = new internal::LauncherView(
+ model_.get(), delegate_.get(), shelf_layout_manager);
launcher_view_->Init();
delegate_view_ = new DelegateView(this);
delegate_view_->AddChildView(launcher_view_);
« no previous file with comments | « ash/launcher/launcher.h ('k') | ash/launcher/launcher_tooltip_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698