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

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

Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks 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 aeb076396ac199e1d320b5f3bdc22c827e5ea5c5..777796cd4b873ee3fb6af646db8e103eaa2e72a6 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
@@ -5,6 +5,7 @@
#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 "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
@@ -62,7 +63,7 @@ void SetLocalizedStrings(base::DictionaryValue* localized_strings) {
base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableFirstRunUITransitions));
std::string shelf_alignment;
- switch (ash::Shelf::ForPrimaryDisplay()->alignment()) {
+ switch (ash::Shelf::ForPrimaryDisplay()->wm_shelf()->alignment()) {
case ash::SHELF_ALIGNMENT_BOTTOM:
case ash::SHELF_ALIGNMENT_BOTTOM_LOCKED:
shelf_alignment = kShelfAlignmentBottom;

Powered by Google App Engine
This is Rietveld 408576698