| 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;
|
|
|