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

Unified Diff: chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again Created 4 years, 4 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 abdf77b3afbb1bb03cd453f1847f56ba120651be..2cb7dabb7fc0c58f6d17c83540cc183c008ac29c 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,8 +4,8 @@
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
-#include "ash/common/shelf/shelf.h"
#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm_shell.h"
#include "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
@@ -62,8 +62,10 @@ void SetLocalizedStrings(base::DictionaryValue* localized_strings) {
"transitionsEnabled",
base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableFirstRunUITransitions));
+ ash::WmShelf* shelf =
+ ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow());
std::string shelf_alignment;
- switch (ash::Shelf::ForPrimaryDisplay()->wm_shelf()->alignment()) {
+ switch (shelf->alignment()) {
case ash::SHELF_ALIGNMENT_BOTTOM:
case ash::SHELF_ALIGNMENT_BOTTOM_LOCKED:
shelf_alignment = kShelfAlignmentBottom;
« 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