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

Unified Diff: ash/shell/window_watcher.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/shell/shelf_delegate_impl.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/window_watcher.cc
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index 988985a5e46d1dc63022a1ff3841ccc010c2644e..3f69ad5ad8455d9c56583587f54146afa2d66cae 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -5,7 +5,7 @@
#include "ash/shell/window_watcher.h"
#include "ash/display/display_controller.h"
-#include "ash/launcher/launcher.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_item_delegate_manager.h"
#include "ash/shelf/shelf_model.h"
#include "ash/shelf/shelf_util.h"
@@ -44,7 +44,7 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
panel_container->AddObserver(watcher_);
aura::Window* container =
- Launcher::ForWindow(root)->shelf_widget()->window_container();
+ Shelf::ForWindow(root)->shelf_widget()->window_container();
container->AddObserver(this);
for (size_t i = 0; i < container->children().size(); ++i)
container->children()[i]->AddObserver(watcher_);
@@ -57,7 +57,7 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
panel_container->RemoveObserver(watcher_);
aura::Window* container =
- Launcher::ForWindow(root)->shelf_widget()->window_container();
+ Shelf::ForWindow(root)->shelf_widget()->window_container();
container->RemoveObserver(this);
for (size_t i = 0; i < container->children().size(); ++i)
container->children()[i]->RemoveObserver(watcher_);
« no previous file with comments | « ash/shell/shelf_delegate_impl.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698