athena/main/athena_main.cc - Issue 583583008: Rename AppsClient -> AppWindowClient

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

Issue 583583008: Rename AppsClient -> AppWindowClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix mac & test 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

« athena/extensions/shell/extensions_delegate_impl.cc ('K') | « athena/extensions/shell/extensions_delegate_impl.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | extensions/browser/app_window/app_window.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_content_client.h"	10 #include "athena/main/athena_content_client.h"

11 #include "athena/main/athena_renderer_pdf_helper.h"	11 #include "athena/main/athena_renderer_pdf_helper.h"

12 #include "athena/main/public/athena_launcher.h"	12 #include "athena/main/public/athena_launcher.h"

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

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

15 #include "base/files/file_util.h"	15 #include "base/files/file_util.h"

16 #include "base/path_service.h"	16 #include "base/path_service.h"

17 #include "components/pdf/renderer/ppb_pdf_impl.h"	17 #include "components/pdf/renderer/ppb_pdf_impl.h"

18 #include "content/public/app/content_main.h"	18 #include "content/public/app/content_main.h"

19 #include "content/public/browser/browser_thread.h"	19 #include "content/public/browser/browser_thread.h"

20 #include "extensions/browser/app_window/app_window.h"	20 #include "extensions/browser/app_window/app_window.h"

21 #include "extensions/browser/app_window/apps_client.h"	21 #include "extensions/browser/app_window/app_window_client.h"

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

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

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

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

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

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

28 #include "extensions/shell/browser/shell_native_app_window.h"	28 #include "extensions/shell/browser/shell_native_app_window.h"

29 #include "extensions/shell/common/shell_content_client.h"	29 #include "extensions/shell/common/shell_content_client.h"

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

31 #include "extensions/shell/renderer/shell_content_renderer_client.h"	31 #include "extensions/shell/renderer/shell_content_renderer_client.h"

(...skipping 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
191	191

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

193 AthenaMainDelegate delegate;	193 AthenaMainDelegate delegate;

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

195	195

196 params.argc = argc;	196 params.argc = argc;

197 params.argv = argv;	197 params.argv = argv;

198	198

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

200 }	200 }

OLD	NEW