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

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

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new location for public/platform Created 7 years, 6 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/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "net/base/net_util.h" 76 #include "net/base/net_util.h"
77 #include "net/base/network_change_notifier.h" 77 #include "net/base/network_change_notifier.h"
78 #include "net/url_request/url_request_context_getter.h" 78 #include "net/url_request/url_request_context_getter.h"
79 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 79 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
80 #include "ui/base/layout.h" 80 #include "ui/base/layout.h"
81 #include "ui/base/touch/touch_device.h" 81 #include "ui/base/touch/touch_device.h"
82 #include "ui/base/ui_base_switches.h" 82 #include "ui/base/ui_base_switches.h"
83 #include "ui/gfx/display.h" 83 #include "ui/gfx/display.h"
84 #include "ui/gfx/screen.h" 84 #include "ui/gfx/screen.h"
85 #include "ui/gl/gl_switches.h" 85 #include "ui/gl/gl_switches.h"
86 #include "webkit/glue/webpreferences.h" 86 #include "webkit/common/webpreferences.h"
87 87
88 #if defined(OS_ANDROID) 88 #if defined(OS_ANDROID)
89 #include "content/public/browser/android/content_view_core.h" 89 #include "content/public/browser/android/content_view_core.h"
90 #include "content/browser/android/date_time_chooser_android.h" 90 #include "content/browser/android/date_time_chooser_android.h"
91 #endif 91 #endif
92 92
93 #if defined(OS_MACOSX) 93 #if defined(OS_MACOSX)
94 #include "base/mac/foundation_util.h" 94 #include "base/mac/foundation_util.h"
95 #include "ui/surface/io_surface_support_mac.h" 95 #include "ui/surface/io_surface_support_mac.h"
96 #endif 96 #endif
(...skipping 3478 matching lines...) Expand 10 before | Expand all | Expand 10 after
3575 } 3575 }
3576 3576
3577 BrowserPluginGuestManager* 3577 BrowserPluginGuestManager*
3578 WebContentsImpl::GetBrowserPluginGuestManager() const { 3578 WebContentsImpl::GetBrowserPluginGuestManager() const {
3579 return static_cast<BrowserPluginGuestManager*>( 3579 return static_cast<BrowserPluginGuestManager*>(
3580 GetBrowserContext()->GetUserData( 3580 GetBrowserContext()->GetUserData(
3581 browser_plugin::kBrowserPluginGuestManagerKeyName)); 3581 browser_plugin::kBrowserPluginGuestManagerKeyName));
3582 } 3582 }
3583 3583
3584 } // namespace content 3584 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698