chrome/browser/chromeos/first_run/steps/tray_step.cc - Issue 2268823002: mash: Move more shelf files to ash/common/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 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:

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 07ca41645a2b4801c2611ec8920d01137d878597..b6305ca3cc99393b3d1e91d105ed50b44d71ca93 100644

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

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

@@ -4,8 +4,8 @@

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

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

#include "ash/first_run/first_run_helper.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"