chrome/browser/chromeos/first_run/steps/tray_step.cc - Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/first_run/steps/tray_step.cc

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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

« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/first_run/steps/tray_step.cc

diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc

index 819ac8c5681226839d2109434596995ed5149ba4..a18df9cc702f03db162c1df67b70be3c612cc384 100644

--- a/chrome/browser/chromeos/first_run/steps/tray_step.cc

+++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc

@@ -5,7 +5,7 @@

#include "chrome/browser/chromeos/first_run/steps/tray_step.h"

#include "ash/first_run/first_run_helper.h"

-#include "ash/shell.h"

+#include "ash/shelf/shelf.h"

#include "base/i18n/rtl.h"

#include "chrome/browser/chromeos/first_run/step_names.h"

#include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"

@@ -27,9 +27,8 @@ void TrayStep::DoShow() {

bounds.height());

FirstRunActor::StepPosition position;

position.SetTop(bounds.y());

- ash::Shell* shell = ash::Shell::GetInstance();

ash::wm::ShelfAlignment alignment =

- shell->GetShelfAlignment(shell->GetPrimaryRootWindow());

+ ash::Shelf::ForPrimaryDisplay()->alignment();

if ((!base::i18n::IsRTL() && alignment != ash::wm::SHELF_ALIGNMENT_LEFT) ||

alignment == ash::wm::SHELF_ALIGNMENT_RIGHT)

position.SetRight(GetOverlaySize().width() - bounds.x());