athena/main/athena_main.cc - Issue 412713002: Move apps/shell to extensions/shell.

Side by Side Diff: athena/main/athena_main.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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 | Annotate | Revision Log

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 "apps/shell/app/shell_main_delegate.h"

6 #include "apps/shell/browser/shell_browser_main_delegate.h"

7 #include "apps/shell/browser/shell_content_browser_client.h"

8 #include "apps/shell/browser/shell_desktop_controller.h"

9 #include "apps/shell/browser/shell_extension_system.h"

10 #include "apps/shell/common/switches.h"

11 #include "apps/shell/renderer/shell_renderer_main_delegate.h"

12 #include "athena/content/public/content_activity_factory.h"	5 #include "athena/content/public/content_activity_factory.h"

13 #include "athena/content/public/content_app_model_builder.h"	6 #include "athena/content/public/content_app_model_builder.h"

14 #include "athena/home/public/home_card.h"	7 #include "athena/home/public/home_card.h"

15 #include "athena/main/athena_app_window_controller.h"	8 #include "athena/main/athena_app_window_controller.h"

16 #include "athena/main/athena_launcher.h"	9 #include "athena/main/athena_launcher.h"

17 #include "athena/main/debug/debug_window.h"	10 #include "athena/main/debug/debug_window.h"

18 #include "athena/main/placeholder.h"	11 #include "athena/main/placeholder.h"

19 #include "athena/main/url_search_provider.h"	12 #include "athena/main/url_search_provider.h"

20 #include "athena/screen/public/screen_manager.h"	13 #include "athena/screen/public/screen_manager.h"

21 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h"	14 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h"

22 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"	15 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"

23 #include "base/command_line.h"	16 #include "base/command_line.h"

24 #include "base/file_util.h"	17 #include "base/file_util.h"

25 #include "base/path_service.h"	18 #include "base/path_service.h"

26 #include "content/public/app/content_main.h"	19 #include "content/public/app/content_main.h"

	20 #include "extensions/shell/app/shell_main_delegate.h"

	21 #include "extensions/shell/browser/shell_browser_main_delegate.h"

	22 #include "extensions/shell/browser/shell_content_browser_client.h"

	23 #include "extensions/shell/browser/shell_desktop_controller.h"

	24 #include "extensions/shell/browser/shell_extension_system.h"

	25 #include "extensions/shell/common/switches.h"

	26 #include "extensions/shell/renderer/shell_renderer_main_delegate.h"

27 #include "ui/app_list/app_list_switches.h"	27 #include "ui/app_list/app_list_switches.h"

28 #include "ui/aura/window_tree_host.h"	28 #include "ui/aura/window_tree_host.h"

29 #include "ui/base/resource/resource_bundle.h"	29 #include "ui/base/resource/resource_bundle.h"

30 #include "ui/keyboard/keyboard_controller.h"	30 #include "ui/keyboard/keyboard_controller.h"

31 #include "ui/keyboard/keyboard_controller_observer.h"	31 #include "ui/keyboard/keyboard_controller_observer.h"

32 #include "ui/wm/core/visibility_controller.h"	32 #include "ui/wm/core/visibility_controller.h"

33	33

34 namespace {	34 namespace {

35	35

36 // We want to load the sample calculator app by default, for a while. Expecting	36 // We want to load the sample calculator app by default, for a while. Expecting

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195	195

196 int main(int argc, const char** argv) {	196 int main(int argc, const char** argv) {

197 AthenaMainDelegate delegate;	197 AthenaMainDelegate delegate;

198 content::ContentMainParams params(&delegate);	198 content::ContentMainParams params(&delegate);

199	199

200 params.argc = argc;	200 params.argc = argc;

201 params.argv = argv;	201 params.argv = argv;

202	202

203 return content::ContentMain(params);	203 return content::ContentMain(params);

204 }	204 }

OLD	NEW

« athena/main/athena_app_window_controller.cc ('K') | « athena/main/athena_app_window_controller.cc ('k') | athena/main/athena_main.gyp » ('j') | athena/resources/athena_resources.gyp » ('J')