Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

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

Issue 555313002: Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/ (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
OLDNEW
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/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/shell/app/shell_main_delegate.h" 20 #include "extensions/shell/app/shell_main_delegate.h"
21 #include "extensions/shell/browser/desktop_controller.h" 21 #include "extensions/shell/browser/desktop_controller.h"
22 #include "extensions/shell/browser/shell_app_window.h" 22 #include "extensions/shell/browser/shell_app_window.h"
23 #include "extensions/shell/browser/shell_browser_main_delegate.h" 23 #include "extensions/shell/browser/shell_browser_main_delegate.h"
24 #include "extensions/shell/browser/shell_content_browser_client.h" 24 #include "extensions/shell/browser/shell_content_browser_client.h"
25 #include "extensions/shell/browser/shell_extension_system.h" 25 #include "extensions/shell/browser/shell_extension_system.h"
26 #include "extensions/shell/common/shell_content_client.h" 26 #include "extensions/shell/common/shell_content_client.h"
27 #include "extensions/shell/common/switches.h" 27 #include "extensions/shell/common/switches.h"
28 #include "extensions/shell/renderer/shell_content_renderer_client.h" 28 #include "extensions/shell/renderer/shell_content_renderer_client.h"
29 #include "ppapi/c/private/ppb_pdf.h" 29 #include "ppapi/c/private/ppb_pdf.h"
30 #include "ui/aura/window_tree_host.h" 30 #include "ui/aura/window_tree_host.h"
31 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.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
37 // to run athena_main at src/ 37 // to run athena_main at src/
38 const char kDefaultAppPath[] = 38 const char kDefaultAppPath[] =
39 "chrome/common/extensions/docs/examples/apps/calculator/app"; 39 "chrome/common/extensions/docs/examples/apps/calculator/app";
40 40
41 } // namespace athena 41 } // namespace
42 42
43 class AthenaDesktopController : public extensions::DesktopController { 43 class AthenaDesktopController : public extensions::DesktopController {
44 public: 44 public:
45 AthenaDesktopController() {} 45 AthenaDesktopController() {}
46 virtual ~AthenaDesktopController() {} 46 virtual ~AthenaDesktopController() {}
47 47
48 private: 48 private:
49 // extensions::DesktopController: 49 // extensions::DesktopController:
50 virtual aura::WindowTreeHost* GetHost() OVERRIDE { 50 virtual aura::WindowTreeHost* GetHost() OVERRIDE {
51 return athena::AthenaEnv::Get()->GetHost(); 51 return athena::AthenaEnv::Get()->GetHost();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 int main(int argc, const char** argv) { 189 int main(int argc, const char** argv) {
190 AthenaMainDelegate delegate; 190 AthenaMainDelegate delegate;
191 content::ContentMainParams params(&delegate); 191 content::ContentMainParams params(&delegate);
192 192
193 params.argc = argc; 193 params.argc = argc;
194 params.argv = argv; 194 params.argv = argv;
195 195
196 return content::ContentMain(params); 196 return content::ContentMain(params);
197 } 197 }
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | athena/system/orientation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698