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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view Created 6 years, 5 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "content/public/browser/user_metrics.h" 77 #include "content/public/browser/user_metrics.h"
78 #include "content/public/browser/web_contents_delegate.h" 78 #include "content/public/browser/web_contents_delegate.h"
79 #include "content/public/browser/web_contents_observer.h" 79 #include "content/public/browser/web_contents_observer.h"
80 #include "content/public/common/bindings_policy.h" 80 #include "content/public/common/bindings_policy.h"
81 #include "content/public/common/content_constants.h" 81 #include "content/public/common/content_constants.h"
82 #include "content/public/common/content_switches.h" 82 #include "content/public/common/content_switches.h"
83 #include "content/public/common/page_zoom.h" 83 #include "content/public/common/page_zoom.h"
84 #include "content/public/common/result_codes.h" 84 #include "content/public/common/result_codes.h"
85 #include "content/public/common/url_constants.h" 85 #include "content/public/common/url_constants.h"
86 #include "content/public/common/url_utils.h" 86 #include "content/public/common/url_utils.h"
87 #include "content/public/common/web_preferences.h"
87 #include "net/base/mime_util.h" 88 #include "net/base/mime_util.h"
88 #include "net/base/net_util.h" 89 #include "net/base/net_util.h"
89 #include "net/http/http_cache.h" 90 #include "net/http/http_cache.h"
90 #include "net/http/http_transaction_factory.h" 91 #include "net/http/http_transaction_factory.h"
91 #include "net/url_request/url_request_context.h" 92 #include "net/url_request/url_request_context.h"
92 #include "net/url_request/url_request_context_getter.h" 93 #include "net/url_request/url_request_context_getter.h"
93 #include "ui/base/layout.h" 94 #include "ui/base/layout.h"
94 #include "ui/gfx/display.h" 95 #include "ui/gfx/display.h"
95 #include "ui/gfx/screen.h" 96 #include "ui/gfx/screen.h"
96 #include "ui/gl/gl_switches.h" 97 #include "ui/gl/gl_switches.h"
97 #include "webkit/common/webpreferences.h"
98 98
99 #if defined(OS_ANDROID) 99 #if defined(OS_ANDROID)
100 #include "content/browser/android/content_view_core_impl.h" 100 #include "content/browser/android/content_view_core_impl.h"
101 #include "content/browser/android/date_time_chooser_android.h" 101 #include "content/browser/android/date_time_chooser_android.h"
102 #include "content/browser/media/android/browser_media_player_manager.h" 102 #include "content/browser/media/android/browser_media_player_manager.h"
103 #include "content/browser/web_contents/web_contents_android.h" 103 #include "content/browser/web_contents/web_contents_android.h"
104 #include "content/public/browser/android/content_view_core.h" 104 #include "content/public/browser/android/content_view_core.h"
105 #endif 105 #endif
106 106
107 #if defined(OS_MACOSX) 107 #if defined(OS_MACOSX)
(...skipping 3999 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 if (new_size != old_size) 4107 if (new_size != old_size)
4108 delegate_->UpdatePreferredSize(this, new_size); 4108 delegate_->UpdatePreferredSize(this, new_size);
4109 } 4109 }
4110 4110
4111 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4111 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4112 FrameTreeNode* node = frame_tree_.root(); 4112 FrameTreeNode* node = frame_tree_.root();
4113 node->render_manager()->ResumeResponseDeferredAtStart(); 4113 node->render_manager()->ResumeResponseDeferredAtStart();
4114 } 4114 }
4115 4115
4116 } // namespace content 4116 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/child/browser_font_resource_trusted.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698