| 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" | 5 #include "apps/shell/app/shell_main_delegate.h" |
| 6 #include "apps/shell/browser/shell_browser_main_delegate.h" | 6 #include "apps/shell/browser/shell_browser_main_delegate.h" |
| 7 #include "apps/shell/browser/shell_desktop_controller.h" | 7 #include "apps/shell/browser/shell_desktop_controller.h" |
| 8 #include "apps/shell/browser/shell_extension_system.h" | 8 #include "apps/shell/browser/shell_extension_system.h" |
| 9 #include "apps/shell/renderer/shell_renderer_main_delegate.h" | 9 #include "apps/shell/renderer/shell_renderer_main_delegate.h" |
| 10 #include "athena/content/public/content_activity_factory.h" | 10 #include "athena/content/public/content_activity_factory.h" |
| 11 #include "athena/content/public/content_app_model_builder.h" | 11 #include "athena/content/public/content_app_model_builder.h" |
| 12 #include "athena/home/public/home_card.h" | 12 #include "athena/home/public/home_card.h" |
| 13 #include "athena/main/athena_app_window_controller.h" | 13 #include "athena/main/athena_app_window_controller.h" |
| 14 #include "athena/main/athena_launcher.h" | 14 #include "athena/main/athena_launcher.h" |
| 15 #include "athena/main/debug/debug_window.h" | 15 #include "athena/main/debug/debug_window.h" |
| 16 #include "athena/main/placeholder.h" | 16 #include "athena/main/placeholder.h" |
| 17 #include "athena/main/url_search_provider.h" | 17 #include "athena/main/url_search_provider.h" |
| 18 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h" | |
| 19 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" | 18 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" |
| 20 #include "base/command_line.h" | 19 #include "base/command_line.h" |
| 21 #include "base/file_util.h" | 20 #include "base/file_util.h" |
| 22 #include "content/public/app/content_main.h" | 21 #include "content/public/app/content_main.h" |
| 23 #include "ui/aura/window_tree_host.h" | 22 #include "ui/aura/window_tree_host.h" |
| 24 #include "ui/wm/core/visibility_controller.h" | 23 #include "ui/wm/core/visibility_controller.h" |
| 25 | 24 |
| 26 namespace { | 25 namespace { |
| 27 const char kAppSwitch[] = "app"; | 26 const char kAppSwitch[] = "app"; |
| 28 | 27 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 class AthenaRendererMainDelegate : public apps::ShellRendererMainDelegate { | 81 class AthenaRendererMainDelegate : public apps::ShellRendererMainDelegate { |
| 83 public: | 82 public: |
| 84 AthenaRendererMainDelegate() {} | 83 AthenaRendererMainDelegate() {} |
| 85 virtual ~AthenaRendererMainDelegate() {} | 84 virtual ~AthenaRendererMainDelegate() {} |
| 86 | 85 |
| 87 private: | 86 private: |
| 88 // apps::ShellRendererMainDelegate: | 87 // apps::ShellRendererMainDelegate: |
| 89 virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {} | 88 virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {} |
| 90 | 89 |
| 91 virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE { | 90 virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE { |
| 92 athena::VirtualKeyboardBindings::Create(render_view); | |
| 93 } | 91 } |
| 94 | 92 |
| 95 DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate); | 93 DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate); |
| 96 }; | 94 }; |
| 97 | 95 |
| 98 class AthenaMainDelegate : public apps::ShellMainDelegate { | 96 class AthenaMainDelegate : public apps::ShellMainDelegate { |
| 99 public: | 97 public: |
| 100 AthenaMainDelegate() {} | 98 AthenaMainDelegate() {} |
| 101 virtual ~AthenaMainDelegate() {} | 99 virtual ~AthenaMainDelegate() {} |
| 102 | 100 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 118 | 116 |
| 119 int main(int argc, const char** argv) { | 117 int main(int argc, const char** argv) { |
| 120 AthenaMainDelegate delegate; | 118 AthenaMainDelegate delegate; |
| 121 content::ContentMainParams params(&delegate); | 119 content::ContentMainParams params(&delegate); |
| 122 | 120 |
| 123 params.argc = argc; | 121 params.argc = argc; |
| 124 params.argv = argv; | 122 params.argv = argv; |
| 125 | 123 |
| 126 return content::ContentMain(params); | 124 return content::ContentMain(params); |
| 127 } | 125 } |
| OLD | NEW |