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

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

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 7 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/html_viewer/setup.h" 5 #include "components/html_viewer/setup.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/icu_util.h" 9 #include "base/i18n/icu_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "components/html_viewer/blink_platform_impl.h" 11 #include "components/html_viewer/blink_platform_impl.h"
12 #include "components/html_viewer/web_media_player_factory.h" 12 #include "components/html_viewer/web_media_player_factory.h"
13 #include "components/scheduler/renderer/renderer_scheduler.h" 13 #include "components/scheduler/renderer/renderer_scheduler.h"
14 #include "gin/v8_initializer.h" 14 #include "gin/v8_initializer.h"
15 #include "mojo/application/public/cpp/application_impl.h"
15 #include "third_party/WebKit/public/web/WebKit.h" 16 #include "third_party/WebKit/public/web/WebKit.h"
16 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 17 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
17 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/base/ui_base_paths.h" 19 #include "ui/base/ui_base_paths.h"
20 20
21 #if defined(OS_ANDROID) 21 #if defined(OS_ANDROID)
22 #include "components/html_viewer/ui_setup_android.h" 22 #include "components/html_viewer/ui_setup_android.h"
23 #else 23 #else
24 #include "components/html_viewer/ui_setup.h" 24 #include "components/html_viewer/ui_setup.h"
25 #endif 25 #endif
26 26
27 namespace html_viewer { 27 namespace html_viewer {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #else 148 #else
149 bool enable_mojo_media_renderer = 149 bool enable_mojo_media_renderer =
150 command_line->HasSwitch(kEnableMojoMediaRenderer); 150 command_line->HasSwitch(kEnableMojoMediaRenderer);
151 151
152 web_media_player_factory_.reset(new WebMediaPlayerFactory( 152 web_media_player_factory_.reset(new WebMediaPlayerFactory(
153 compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer)); 153 compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer));
154 #endif 154 #endif
155 } 155 }
156 156
157 } // namespace html_viewer 157 } // namespace html_viewer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698