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

Unified Diff: ash/first_run/first_run_helper_impl.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/first_run/first_run_helper_impl.cc
diff --git a/ash/first_run/first_run_helper_impl.cc b/ash/first_run/first_run_helper_impl.cc
index 9efb0db911824d3d0cf6e6b0998d96bb9ccfc1b4..f8a3ca62e2991c96042f2c70b8864af451684aad 100644
--- a/ash/first_run/first_run_helper_impl.cc
+++ b/ash/first_run/first_run_helper_impl.cc
@@ -4,7 +4,7 @@
#include "ash/first_run/first_run_helper_impl.h"
-#include "ash/launcher/launcher.h"
+#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/system/tray/system_tray.h"
@@ -64,13 +64,13 @@ void FirstRunHelperImpl::CloseAppList() {
}
gfx::Rect FirstRunHelperImpl::GetLauncherBounds() {
- ash::Launcher* launcher = ash::Launcher::ForPrimaryDisplay();
- return launcher->GetVisibleItemsBoundsInScreen();
+ Shelf* shelf = Shelf::ForPrimaryDisplay();
+ return shelf->GetVisibleItemsBoundsInScreen();
}
gfx::Rect FirstRunHelperImpl::GetAppListButtonBounds() {
- ash::Launcher* launcher = ash::Launcher::ForPrimaryDisplay();
- views::View* app_button = launcher->GetAppListButtonView();
+ Shelf* shelf = Shelf::ForPrimaryDisplay();
+ views::View* app_button = shelf->GetAppListButtonView();
return app_button->GetBoundsInScreen();
}
@@ -120,4 +120,3 @@ gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() {
}
} // namespace ash
-
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698