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

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

Issue 12356002: [NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
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/lib/aw_browser_dependency_factory_impl.h" 8 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
9 #include "android_webview/native/aw_geolocation_permission_context.h" 9 #include "android_webview/native/aw_geolocation_permission_context.h"
10 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 10 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
(...skipping 10 matching lines...) Expand all
21 21
22 AwMainDelegate::AwMainDelegate() { 22 AwMainDelegate::AwMainDelegate() {
23 } 23 }
24 24
25 AwMainDelegate::~AwMainDelegate() { 25 AwMainDelegate::~AwMainDelegate() {
26 } 26 }
27 27
28 bool AwMainDelegate::BasicStartupComplete(int* exit_code) { 28 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
29 content::SetContentClient(&content_client_); 29 content::SetContentClient(&content_client_);
30 30
31 CommandLine* command_line = CommandLine::ForCurrentProcess(); 31 // CommandLine* command_line = CommandLine::ForCurrentProcess();
32 // Set the command line to enable synchronous API compatibility. 32 // Set the command line to enable synchronous API compatibility.
33 command_line->AppendSwitch(switches::kEnableWebViewSynchronousAPIs); 33 // command_line->AppendSwitch(switches::kEnableWebViewSynchronousAPIs);
34 34
35 return false; 35 return false;
36 } 36 }
37 37
38 void AwMainDelegate::PreSandboxStartup() { 38 void AwMainDelegate::PreSandboxStartup() {
39 // TODO(torne): When we have a separate renderer process, we need to handle 39 // TODO(torne): When we have a separate renderer process, we need to handle
40 // being passed open FDs for the resource paks here. 40 // being passed open FDs for the resource paks here.
41 } 41 }
42 42
43 void AwMainDelegate::SandboxInitialized(const std::string& process_type) { 43 void AwMainDelegate::SandboxInitialized(const std::string& process_type) {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 AwBrowserContext* browser_context) { 90 AwBrowserContext* browser_context) {
91 return AwGeolocationPermissionContext::Create(browser_context); 91 return AwGeolocationPermissionContext::Create(browser_context);
92 } 92 }
93 93
94 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 94 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
95 content::WebContents* web_contents) { 95 content::WebContents* web_contents) {
96 return AwWebContentsViewDelegate::Create(web_contents); 96 return AwWebContentsViewDelegate::Create(web_contents);
97 } 97 }
98 98
99 } // namespace android_webview 99 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698