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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 1278593004: Introduce ThreadedInputConnection behind a switch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "android_webview/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
10 #include "android_webview/common/aw_descriptors.h" 10 #include "android_webview/common/aw_descriptors.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 kV8NativesDataDescriptor, kNativesFileName)); 134 kV8NativesDataDescriptor, kNativesFileName));
135 CHECK(base::android::RegisterApkAssetWithGlobalDescriptors( 135 CHECK(base::android::RegisterApkAssetWithGlobalDescriptors(
136 kV8SnapshotDataDescriptor, kSnapshotFileName)); 136 kV8SnapshotDataDescriptor, kSnapshotFileName));
137 } 137 }
138 138
139 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) { 139 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) {
140 cl->AppendSwitch(switches::kInProcessGPU); 140 cl->AppendSwitch(switches::kInProcessGPU);
141 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1"); 141 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1");
142 } 142 }
143 143
144 // TODO(changwan): do not ship this
145 cl->AppendSwitch(switches::kUseImeThread);
146
144 return false; 147 return false;
145 } 148 }
146 149
147 void AwMainDelegate::PreSandboxStartup() { 150 void AwMainDelegate::PreSandboxStartup() {
148 #if defined(ARCH_CPU_ARM_FAMILY) 151 #if defined(ARCH_CPU_ARM_FAMILY)
149 // Create an instance of the CPU class to parse /proc/cpuinfo and cache 152 // Create an instance of the CPU class to parse /proc/cpuinfo and cache
150 // cpu_brand info. 153 // cpu_brand info.
151 base::CPU cpu_info; 154 base::CPU cpu_info;
152 #endif 155 #endif
153 156
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 #if defined(VIDEO_HOLE) 243 #if defined(VIDEO_HOLE)
241 content::ExternalVideoSurfaceContainer* 244 content::ExternalVideoSurfaceContainer*
242 AwMainDelegate::CreateExternalVideoSurfaceContainer( 245 AwMainDelegate::CreateExternalVideoSurfaceContainer(
243 content::WebContents* web_contents) { 246 content::WebContents* web_contents) {
244 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( 247 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
245 web_contents); 248 web_contents);
246 } 249 }
247 #endif 250 #endif
248 251
249 } // namespace android_webview 252 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698