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

Side by Side Diff: components/html_viewer/html_viewer.cc

Issue 1099303002: Move html_viewer from mojo/services to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/html_viewer/html_viewer_version.rc » ('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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/i18n/icu_util.h" 6 #include "base/i18n/icu_util.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "components/html_viewer/blink_platform_impl.h"
14 #include "components/html_viewer/discardable_memory_allocator.h"
15 #include "components/html_viewer/html_document.h"
16 #include "components/html_viewer/web_media_player_factory.h"
13 #include "gin/v8_initializer.h" 17 #include "gin/v8_initializer.h"
14 #include "mojo/application/application_runner_chromium.h" 18 #include "mojo/application/application_runner_chromium.h"
15 #include "mojo/services/html_viewer/blink_platform_impl.h"
16 #include "mojo/services/html_viewer/discardable_memory_allocator.h"
17 #include "mojo/services/html_viewer/html_document.h"
18 #include "mojo/services/html_viewer/web_media_player_factory.h"
19 #include "mojo/services/network/public/interfaces/network_service.mojom.h" 19 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
20 #include "third_party/WebKit/public/web/WebKit.h" 20 #include "third_party/WebKit/public/web/WebKit.h"
21 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 21 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
22 #include "third_party/mojo/src/mojo/public/c/system/main.h" 22 #include "third_party/mojo/src/mojo/public/c/system/main.h"
23 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio n.h" 23 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio n.h"
24 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h" 24 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h"
25 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" 25 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
26 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" 26 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
27 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_imp l.h" 27 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_imp l.h"
28 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" 28 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); 246 DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
247 }; 247 };
248 248
249 } // namespace html_viewer 249 } // namespace html_viewer
250 250
251 MojoResult MojoMain(MojoHandle shell_handle) { 251 MojoResult MojoMain(MojoHandle shell_handle) {
252 mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer); 252 mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer);
253 return runner.Run(shell_handle); 253 return runner.Run(shell_handle);
254 } 254 }
OLDNEW
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/html_viewer/html_viewer_version.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698