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

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

Issue 328303008: athena: Use mojo to provide the bindings for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 4 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
« no previous file with comments | « athena/athena.gyp ('k') | athena/virtual_keyboard/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/home/public/home_card.h" 7 #include "athena/home/public/home_card.h"
8 #include "athena/main/athena_app_window_controller.h" 8 #include "athena/main/athena_app_window_controller.h"
9 #include "athena/main/athena_launcher.h" 9 #include "athena/main/athena_launcher.h"
10 #include "athena/main/debug/debug_window.h" 10 #include "athena/main/debug/debug_window.h"
11 #include "athena/main/placeholder.h" 11 #include "athena/main/placeholder.h"
12 #include "athena/main/url_search_provider.h" 12 #include "athena/main/url_search_provider.h"
13 #include "athena/screen/public/screen_manager.h" 13 #include "athena/screen/public/screen_manager.h"
14 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h"
15 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" 14 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
16 #include "base/command_line.h" 15 #include "base/command_line.h"
17 #include "base/file_util.h" 16 #include "base/file_util.h"
18 #include "base/path_service.h" 17 #include "base/path_service.h"
19 #include "content/public/app/content_main.h" 18 #include "content/public/app/content_main.h"
20 #include "extensions/shell/app/shell_main_delegate.h" 19 #include "extensions/shell/app/shell_main_delegate.h"
21 #include "extensions/shell/browser/shell_browser_main_delegate.h" 20 #include "extensions/shell/browser/shell_browser_main_delegate.h"
22 #include "extensions/shell/browser/shell_content_browser_client.h" 21 #include "extensions/shell/browser/shell_content_browser_client.h"
23 #include "extensions/shell/browser/shell_desktop_controller.h" 22 #include "extensions/shell/browser/shell_desktop_controller.h"
24 #include "extensions/shell/browser/shell_extension_system.h" 23 #include "extensions/shell/browser/shell_extension_system.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 : public extensions::ShellRendererMainDelegate { 157 : public extensions::ShellRendererMainDelegate {
159 public: 158 public:
160 AthenaRendererMainDelegate() {} 159 AthenaRendererMainDelegate() {}
161 virtual ~AthenaRendererMainDelegate() {} 160 virtual ~AthenaRendererMainDelegate() {}
162 161
163 private: 162 private:
164 // extensions::ShellRendererMainDelegate: 163 // extensions::ShellRendererMainDelegate:
165 virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {} 164 virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {}
166 165
167 virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE { 166 virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE {
168 athena::VirtualKeyboardBindings::Create(render_view);
169 } 167 }
170 168
171 DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate); 169 DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate);
172 }; 170 };
173 171
174 class AthenaMainDelegate : public extensions::ShellMainDelegate { 172 class AthenaMainDelegate : public extensions::ShellMainDelegate {
175 public: 173 public:
176 AthenaMainDelegate() {} 174 AthenaMainDelegate() {}
177 virtual ~AthenaMainDelegate() {} 175 virtual ~AthenaMainDelegate() {}
178 176
(...skipping 23 matching lines...) Expand all
202 200
203 int main(int argc, const char** argv) { 201 int main(int argc, const char** argv) {
204 AthenaMainDelegate delegate; 202 AthenaMainDelegate delegate;
205 content::ContentMainParams params(&delegate); 203 content::ContentMainParams params(&delegate);
206 204
207 params.argc = argc; 205 params.argc = argc;
208 params.argv = argv; 206 params.argv = argv;
209 207
210 return content::ContentMain(params); 208 return content::ContentMain(params);
211 } 209 }
OLDNEW
« no previous file with comments | « athena/athena.gyp ('k') | athena/virtual_keyboard/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698