chrome/browser/chromeos/first_run/steps/tray_step.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/chromeos/first_run/steps/tray_step.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/chromeos/accessibility/chromevox_panel.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

	7 #include "ash/common/shelf/shelf.h"

7 #include "ash/first_run/first_run_helper.h"	8 #include "ash/first_run/first_run_helper.h"

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

9 #include "base/i18n/rtl.h"	9 #include "base/i18n/rtl.h"

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

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

12 #include "ui/gfx/geometry/rect.h"	12 #include "ui/gfx/geometry/rect.h"

13 #include "ui/gfx/geometry/size.h"	13 #include "ui/gfx/geometry/size.h"

14	14

15 namespace chromeos {	15 namespace chromeos {

16 namespace first_run {	16 namespace first_run {

17	17

18 TrayStep::TrayStep(ash::FirstRunHelper* shell_helper, FirstRunActor* actor)	18 TrayStep::TrayStep(ash::FirstRunHelper* shell_helper, FirstRunActor* actor)

(...skipping 13 matching lines...) Expand all Loading...
32 alignment == ash::SHELF_ALIGNMENT_RIGHT)	32 alignment == ash::SHELF_ALIGNMENT_RIGHT)

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

34 else	34 else

35 position.SetLeft(bounds.right());	35 position.SetLeft(bounds.right());

36 actor()->ShowStepPositioned(name(), position);	36 actor()->ShowStepPositioned(name(), position);

37 }	37 }

38	38

39 } // namespace first_run	39 } // namespace first_run

40 } // namespace chromeos	40 } // namespace chromeos

41	41

OLD	NEW