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

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

Issue 17381009: Move io_surface_support_mac to ui/gl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ui-gyp: fixbuild 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/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "ui/gl/gl_switches.h" 88 #include "ui/gl/gl_switches.h"
89 #include "webkit/common/webpreferences.h" 89 #include "webkit/common/webpreferences.h"
90 90
91 #if defined(OS_ANDROID) 91 #if defined(OS_ANDROID)
92 #include "content/browser/android/date_time_chooser_android.h" 92 #include "content/browser/android/date_time_chooser_android.h"
93 #include "content/public/browser/android/content_view_core.h" 93 #include "content/public/browser/android/content_view_core.h"
94 #endif 94 #endif
95 95
96 #if defined(OS_MACOSX) 96 #if defined(OS_MACOSX)
97 #include "base/mac/foundation_util.h" 97 #include "base/mac/foundation_util.h"
98 #include "ui/surface/io_surface_support_mac.h" 98 #include "ui/gl/io_surface_support_mac.h"
99 #endif 99 #endif
100 100
101 #if defined(OS_ANDROID) 101 #if defined(OS_ANDROID)
102 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" 102 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"
103 #endif 103 #endif
104 104
105 // Cross-Site Navigations 105 // Cross-Site Navigations
106 // 106 //
107 // If a WebContentsImpl is told to navigate to a different web site (as 107 // If a WebContentsImpl is told to navigate to a different web site (as
108 // determined by SiteInstance), it will replace its current RenderViewHost with 108 // determined by SiteInstance), it will replace its current RenderViewHost with
(...skipping 3592 matching lines...) Expand 10 before | Expand all | Expand 10 after
3701 } 3701 }
3702 3702
3703 BrowserPluginGuestManager* 3703 BrowserPluginGuestManager*
3704 WebContentsImpl::GetBrowserPluginGuestManager() const { 3704 WebContentsImpl::GetBrowserPluginGuestManager() const {
3705 return static_cast<BrowserPluginGuestManager*>( 3705 return static_cast<BrowserPluginGuestManager*>(
3706 GetBrowserContext()->GetUserData( 3706 GetBrowserContext()->GetUserData(
3707 browser_plugin::kBrowserPluginGuestManagerKeyName)); 3707 browser_plugin::kBrowserPluginGuestManagerKeyName));
3708 } 3708 }
3709 3709
3710 } // namespace content 3710 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/common/gpu/image_transport_surface_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698