| 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/content/public/content_activity_factory.h" | 5 #include "athena/content/public/content_activity_factory.h" |
| 6 #include "athena/content/public/content_app_model_builder.h" | 6 #include "athena/content/public/content_app_model_builder.h" |
| 7 #include "athena/content/public/web_contents_view_delegate_creator.h" |
| 7 #include "athena/home/public/home_card.h" | 8 #include "athena/home/public/home_card.h" |
| 8 #include "athena/main/athena_app_window_controller.h" | 9 #include "athena/main/athena_app_window_controller.h" |
| 9 #include "athena/main/athena_launcher.h" | 10 #include "athena/main/athena_launcher.h" |
| 10 #include "athena/main/debug/debug_window.h" | 11 #include "athena/main/debug/debug_window.h" |
| 11 #include "athena/main/placeholder.h" | 12 #include "athena/main/placeholder.h" |
| 12 #include "athena/main/url_search_provider.h" | 13 #include "athena/main/url_search_provider.h" |
| 13 #include "athena/screen/public/screen_manager.h" | 14 #include "athena/screen/public/screen_manager.h" |
| 14 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" | 15 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" |
| 15 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 16 #include "base/file_util.h" | 17 #include "base/file_util.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 : public extensions::ShellContentBrowserClient { | 139 : public extensions::ShellContentBrowserClient { |
| 139 public: | 140 public: |
| 140 AthenaContentBrowserClient() | 141 AthenaContentBrowserClient() |
| 141 : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) { | 142 : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) { |
| 142 } | 143 } |
| 143 virtual ~AthenaContentBrowserClient() {} | 144 virtual ~AthenaContentBrowserClient() {} |
| 144 | 145 |
| 145 // content::ContentBrowserClient: | 146 // content::ContentBrowserClient: |
| 146 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( | 147 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( |
| 147 content::WebContents* web_contents) OVERRIDE { | 148 content::WebContents* web_contents) OVERRIDE { |
| 148 // TODO(oshima): Implement athena's WebContentsViewDelegate. | 149 return athena::CreateWebContentsViewDelegate(web_contents); |
| 149 return NULL; | |
| 150 } | 150 } |
| 151 | 151 |
| 152 private: | 152 private: |
| 153 DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient); | 153 DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient); |
| 154 }; | 154 }; |
| 155 | 155 |
| 156 class AthenaRendererMainDelegate | 156 class AthenaRendererMainDelegate |
| 157 : public extensions::ShellRendererMainDelegate { | 157 : public extensions::ShellRendererMainDelegate { |
| 158 public: | 158 public: |
| 159 AthenaRendererMainDelegate() {} | 159 AthenaRendererMainDelegate() {} |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 | 200 |
| 201 int main(int argc, const char** argv) { | 201 int main(int argc, const char** argv) { |
| 202 AthenaMainDelegate delegate; | 202 AthenaMainDelegate delegate; |
| 203 content::ContentMainParams params(&delegate); | 203 content::ContentMainParams params(&delegate); |
| 204 | 204 |
| 205 params.argc = argc; | 205 params.argc = argc; |
| 206 params.argv = argv; | 206 params.argv = argv; |
| 207 | 207 |
| 208 return content::ContentMain(params); | 208 return content::ContentMain(params); |
| 209 } | 209 } |
| OLD | NEW |