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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_interactive_uitest.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: chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
index 15b039b0a63c516d6fa017ad0eb1f4eca1362524..f139a47e6598d6f00361f876366fec76393917b0 100644
--- a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
@@ -6,8 +6,8 @@
#include "ash/public/cpp/shell_window_ids.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/wm/window_util.h"
#include "ash/wm_window.h"
@@ -21,7 +21,7 @@ using AppListTest = InProcessBrowserTest;
// An integration test to toggle the app list by pressing the shelf button.
IN_PROC_BROWSER_TEST_F(AppListTest, PressAppListButtonToShowAndDismiss) {
- ash::WmShelf* shelf = ash::WmShelf::ForWindow(ash::wm::GetActiveWindow());
+ ash::Shelf* shelf = ash::Shelf::ForWindow(ash::wm::GetActiveWindow());
ash::ShelfWidget* shelf_widget = shelf->shelf_widget();
ash::AppListButton* app_list_button = shelf_widget->GetAppListButton();

Powered by Google App Engine
This is Rietveld 408576698