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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 147373005: Move webkit/common/webpreferences to content/public/common/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.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_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/aw_contents_client_bridge_base.h" 9 #include "android_webview/browser/aw_contents_client_bridge_base.h"
10 #include "android_webview/browser/aw_contents_io_thread_client.h" 10 #include "android_webview/browser/aw_contents_io_thread_client.h"
11 #include "android_webview/browser/aw_cookie_access_policy.h" 11 #include "android_webview/browser/aw_cookie_access_policy.h"
12 #include "android_webview/browser/aw_quota_permission_context.h" 12 #include "android_webview/browser/aw_quota_permission_context.h"
13 #include "android_webview/browser/aw_web_preferences_populater.h" 13 #include "android_webview/browser/aw_web_preferences_populater.h"
14 #include "android_webview/browser/jni_dependency_factory.h" 14 #include "android_webview/browser/jni_dependency_factory.h"
15 #include "android_webview/browser/net_disk_cache_remover.h" 15 #include "android_webview/browser/net_disk_cache_remover.h"
16 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h" 16 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h"
17 #include "android_webview/common/render_view_messages.h" 17 #include "android_webview/common/render_view_messages.h"
18 #include "android_webview/common/url_constants.h" 18 #include "android_webview/common/url_constants.h"
19 #include "base/base_paths_android.h" 19 #include "base/base_paths_android.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "content/public/browser/access_token_store.h" 21 #include "content/public/browser/access_token_store.h"
22 #include "content/public/browser/browser_message_filter.h" 22 #include "content/public/browser/browser_message_filter.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "content/public/browser/child_process_security_policy.h" 24 #include "content/public/browser/child_process_security_policy.h"
25 #include "content/public/browser/render_process_host.h" 25 #include "content/public/browser/render_process_host.h"
26 #include "content/public/browser/render_view_host.h" 26 #include "content/public/browser/render_view_host.h"
27 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "content/public/common/webpreferences.h"
29 #include "grit/ui_resources.h" 30 #include "grit/ui_resources.h"
30 #include "net/android/network_library.h" 31 #include "net/android/network_library.h"
31 #include "net/ssl/ssl_cert_request_info.h" 32 #include "net/ssl/ssl_cert_request_info.h"
32 #include "net/ssl/ssl_info.h" 33 #include "net/ssl/ssl_info.h"
33 #include "ui/base/l10n/l10n_util_android.h" 34 #include "ui/base/l10n/l10n_util_android.h"
34 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
35 #include "webkit/common/webpreferences.h"
36 36
37 using content::BrowserThread; 37 using content::BrowserThread;
38 38
39 namespace android_webview { 39 namespace android_webview {
40 namespace { 40 namespace {
41 41
42 // TODO(sgurun) move this to its own file. 42 // TODO(sgurun) move this to its own file.
43 // This class filters out incoming aw_contents related IPC messages for the 43 // This class filters out incoming aw_contents related IPC messages for the
44 // renderer process on the IPC thread. 44 // renderer process on the IPC thread.
45 class AwContentsMessageFilter : public content::BrowserMessageFilter { 45 class AwContentsMessageFilter : public content::BrowserMessageFilter {
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 WebPreferences* web_prefs) { 491 WebPreferences* web_prefs) {
492 if (!preferences_populater_.get()) { 492 if (!preferences_populater_.get()) {
493 preferences_populater_ = make_scoped_ptr(native_factory_-> 493 preferences_populater_ = make_scoped_ptr(native_factory_->
494 CreateWebPreferencesPopulater()); 494 CreateWebPreferencesPopulater());
495 } 495 }
496 preferences_populater_->PopulateFor( 496 preferences_populater_->PopulateFor(
497 content::WebContents::FromRenderViewHost(rvh), web_prefs); 497 content::WebContents::FromRenderViewHost(rvh), web_prefs);
498 } 498 }
499 499
500 } // namespace android_webview 500 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/native/aw_settings.cc » ('j') | content/public/common/webpreferences.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698