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

Unified Diff: chrome/browser/ui/webui/chromeos/first_run/first_run_ui.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/webui/chromeos/first_run/first_run_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
index 56d40d4f8229e8721d860985a3c84536595671f5..c439b90da9ad31d2286bf65b981f20484e35b73e 100644
--- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
@@ -66,8 +66,7 @@ void SetLocalizedStrings(base::DictionaryValue* localized_strings) {
localized_strings->SetString(
"accessibleTitle",
l10n_util::GetStringUTF16(IDS_FIRST_RUN_STEP_ACCESSIBLE_TITLE));
- ash::WmShelf* shelf =
- ash::WmShelf::ForWindow(ash::Shell::GetPrimaryRootWindow());
+ ash::Shelf* shelf = ash::Shelf::ForWindow(ash::Shell::GetPrimaryRootWindow());
std::string shelf_alignment;
switch (shelf->alignment()) {
case ash::SHELF_ALIGNMENT_BOTTOM:
« no previous file with comments | « chrome/browser/ui/ash/shelf_browsertest.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698