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

Side by Side Diff: mojo/services/html_viewer/html_viewer.cc

Issue 799113004: Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add mojo's ply to checklicenses whitelist Created 6 years 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
11 #include "mojo/application/application_runner_chromium.h" 11 #include "mojo/application/application_runner_chromium.h"
12 #include "mojo/public/c/system/main.h" 12 #include "mojo/public/c/system/main.h"
13 #include "mojo/public/cpp/application/application_connection.h" 13 #include "mojo/public/cpp/application/application_connection.h"
14 #include "mojo/public/cpp/application/application_delegate.h" 14 #include "mojo/public/cpp/application/application_delegate.h"
15 #include "mojo/public/cpp/application/application_impl.h" 15 #include "mojo/public/cpp/application/application_impl.h"
16 #include "mojo/public/cpp/application/connect.h" 16 #include "mojo/public/cpp/application/connect.h"
17 #include "mojo/public/cpp/application/interface_factory_impl.h" 17 #include "mojo/public/cpp/application/interface_factory_impl.h"
18 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
18 #include "mojo/services/html_viewer/html_document.h" 19 #include "mojo/services/html_viewer/html_document.h"
19 #include "mojo/services/html_viewer/mojo_blink_platform_impl.h" 20 #include "mojo/services/html_viewer/mojo_blink_platform_impl.h"
20 #include "mojo/services/html_viewer/webmediaplayer_factory.h" 21 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
21 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom. h" 22 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
22 #include "mojo/services/public/interfaces/network/network_service.mojom.h"
23 #include "third_party/WebKit/public/web/WebKit.h" 23 #include "third_party/WebKit/public/web/WebKit.h"
24 24
25 #if !defined(COMPONENT_BUILD) 25 #if !defined(COMPONENT_BUILD)
26 #include "base/i18n/icu_util.h" 26 #include "base/i18n/icu_util.h"
27 #include "base/path_service.h" 27 #include "base/path_service.h"
28 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
29 #include "ui/base/ui_base_paths.h" 29 #include "ui/base/ui_base_paths.h"
30 #endif 30 #endif
31 31
32 namespace mojo { 32 namespace mojo {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); 187 DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
188 }; 188 };
189 189
190 } // namespace mojo 190 } // namespace mojo
191 191
192 MojoResult MojoMain(MojoHandle shell_handle) { 192 MojoResult MojoMain(MojoHandle shell_handle) {
193 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer); 193 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer);
194 return runner.Run(shell_handle); 194 return runner.Run(shell_handle);
195 } 195 }
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/html_document.cc ('k') | mojo/services/html_viewer/mojo_blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698