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: android_webview/browser/aw_browser_main_parts.cc

Issue 2300703005: DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways. (Closed)
Patch Set: for_landing! Created 4 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/browser/aw_browser_main_parts.h" 5 #include "android_webview/browser/aw_browser_main_parts.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_content_browser_client.h" 8 #include "android_webview/browser/aw_content_browser_client.h"
9 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
10 #include "android_webview/browser/aw_result_codes.h" 9 #include "android_webview/browser/aw_result_codes.h"
11 #include "android_webview/browser/deferred_gpu_command_service.h" 10 #include "android_webview/browser/deferred_gpu_command_service.h"
12 #include "android_webview/browser/net/aw_network_change_notifier_factory.h" 11 #include "android_webview/browser/net/aw_network_change_notifier_factory.h"
13 #include "android_webview/common/aw_resource.h" 12 #include "android_webview/common/aw_resource.h"
14 #include "android_webview/common/aw_switches.h" 13 #include "android_webview/common/aw_switches.h"
15 #include "base/android/apk_assets.h" 14 #include "base/android/apk_assets.h"
16 #include "base/android/build_info.h" 15 #include "base/android/build_info.h"
17 #include "base/android/locale_utils.h" 16 #include "base/android/locale_utils.h"
18 #include "base/android/memory_pressure_listener_android.h" 17 #include "base/android/memory_pressure_listener_android.h"
19 #include "base/command_line.h" 18 #include "base/command_line.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 123
125 return content::RESULT_CODE_NORMAL_EXIT; 124 return content::RESULT_CODE_NORMAL_EXIT;
126 } 125 }
127 126
128 void AwBrowserMainParts::PreMainMessageLoopRun() { 127 void AwBrowserMainParts::PreMainMessageLoopRun() {
129 browser_client_->InitBrowserContext()->PreMainMessageLoopRun(); 128 browser_client_->InitBrowserContext()->PreMainMessageLoopRun();
130 129
131 device::GeolocationProvider::SetGeolocationDelegate( 130 device::GeolocationProvider::SetGeolocationDelegate(
132 new AwGeolocationDelegate()); 131 new AwGeolocationDelegate());
133 132
134 AwDevToolsDiscoveryProvider::Install();
135
136 content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView(); 133 content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
137 } 134 }
138 135
139 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { 136 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
140 // Android WebView does not use default MessageLoop. It has its own 137 // Android WebView does not use default MessageLoop. It has its own
141 // Android specific MessageLoop. 138 // Android specific MessageLoop.
142 return true; 139 return true;
143 } 140 }
144 141
145 } // namespace android_webview 142 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/browser/aw_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698