athena/main/athena_main.cc - Issue 505273002: Move app_shell specific impl from athena_lib to athena_shell_lib

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: athena/main/athena_main.cc

Issue 505273002: Move app_shell specific impl from athena_lib to athena_shell_lib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 | « athena/main/athena_launcher.cc ('k') | athena/test/sample_activity_factory.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "athena/activity/public/activity_factory.h"	5 #include "athena/activity/public/activity_factory.h"

6 #include "athena/activity/public/activity_manager.h"	6 #include "athena/activity/public/activity_manager.h"

7 #include "athena/content/public/web_contents_view_delegate_creator.h"	7 #include "athena/content/public/web_contents_view_delegate_creator.h"

8 #include "athena/env/public/athena_env.h"	8 #include "athena/env/public/athena_env.h"

9 #include "athena/extensions/public/extensions_delegate.h"	9 #include "athena/extensions/public/extensions_delegate.h"

10 #include "athena/main/athena_app_window_controller.h"

11 #include "athena/main/athena_launcher.h"	10 #include "athena/main/athena_launcher.h"

12 #include "athena/screen/public/screen_manager.h"	11 #include "athena/screen/public/screen_manager.h"

13 #include "base/command_line.h"	12 #include "base/command_line.h"

14 #include "base/file_util.h"	13 #include "base/file_util.h"

15 #include "base/path_service.h"	14 #include "base/path_service.h"

16 #include "content/public/app/content_main.h"	15 #include "content/public/app/content_main.h"

17 #include "content/public/browser/browser_thread.h"	16 #include "content/public/browser/browser_thread.h"

18 #include "extensions/shell/app/shell_main_delegate.h"	17 #include "extensions/shell/app/shell_main_delegate.h"

19 #include "extensions/shell/browser/desktop_controller.h"	18 #include "extensions/shell/browser/desktop_controller.h"

20 #include "extensions/shell/browser/shell_app_window.h"	19 #include "extensions/shell/browser/shell_app_window.h"

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
148	147

149 int main(int argc, const char** argv) {	148 int main(int argc, const char** argv) {

150 AthenaMainDelegate delegate;	149 AthenaMainDelegate delegate;

151 content::ContentMainParams params(&delegate);	150 content::ContentMainParams params(&delegate);

152	151

153 params.argc = argc;	152 params.argc = argc;

154 params.argv = argv;	153 params.argv = argv;

155	154

156 return content::ContentMain(params);	155 return content::ContentMain(params);

157 }	156 }

OLD	NEW