chrome/browser/ui/webui/chromeos/first_run/first_run_ui.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/ui/webui/chromeos/first_run/first_run_ui.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/ui/views/frame/immersive_mode_controller_ash_unittest.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_uitest.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/ui/webui/chromeos/first_run/first_run_ui.h"	5 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"

6	6

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

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

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

12 #include "chrome/common/url_constants.h"	12 #include "chrome/common/url_constants.h"

13 #include "chrome/grit/chromium_strings.h"	13 #include "chrome/grit/chromium_strings.h"

14 #include "chrome/grit/generated_resources.h"	14 #include "chrome/grit/generated_resources.h"

15 #include "chromeos/chromeos_switches.h"	15 #include "chromeos/chromeos_switches.h"

16 #include "content/public/browser/web_ui.h"	16 #include "content/public/browser/web_ui.h"

17 #include "content/public/browser/web_ui_data_source.h"	17 #include "content/public/browser/web_ui_data_source.h"

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
99 : WebUIController(web_ui),	99 : WebUIController(web_ui),

100 actor_(NULL) {	100 actor_(NULL) {

101 FirstRunHandler* handler = new FirstRunHandler();	101 FirstRunHandler* handler = new FirstRunHandler();

102 actor_ = handler;	102 actor_ = handler;

103 web_ui->AddMessageHandler(handler);	103 web_ui->AddMessageHandler(handler);

104 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), CreateDataSource());	104 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), CreateDataSource());

105 }	105 }

106	106

107 } // namespace chromeos	107 } // namespace chromeos

108	108

OLD	NEW