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

Unified Diff: ash/app_list/app_list_delegate_impl.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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
Index: ash/app_list/app_list_delegate_impl.cc
diff --git a/ash/app_list/app_list_delegate_impl.cc b/ash/app_list/app_list_delegate_impl.cc
index d179b03d8c2db42f1c65d37d364560ca98c7c9fa..c8fbf0f0edde5c4af59d8358fb5f6e6c17f0016b 100644
--- a/ash/app_list/app_list_delegate_impl.cc
+++ b/ash/app_list/app_list_delegate_impl.cc
@@ -6,8 +6,8 @@
#include "ash/root_window_controller.h"
#include "ash/shelf/app_list_button.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
#include "ash/wm_window.h"
@@ -28,7 +28,7 @@ void AppListDelegateImpl::OnAppListVisibilityChanged(bool visible,
aura::Window* root_window =
ShellPort::Get()->GetRootWindowForDisplayId(display_id);
AppListButton* app_list_button =
- WmShelf::ForWindow(root_window)->shelf_widget()->GetAppListButton();
+ Shelf::ForWindow(root_window)->shelf_widget()->GetAppListButton();
if (!app_list_button)
return;
« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/app_list/app_list_presenter_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698