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

Side by Side Diff: trunk/src/content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 16232014: Revert 203261 "split webkit/glue/webpreferences to common and re..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/gpu/gpu_data_manager_impl_private.h" 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
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 13 matching lines...) Expand all
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "gpu/command_buffer/service/gpu_switches.h" 25 #include "gpu/command_buffer/service/gpu_switches.h"
26 #include "gpu/config/gpu_control_list_jsons.h" 26 #include "gpu/config/gpu_control_list_jsons.h"
27 #include "gpu/config/gpu_feature_type.h" 27 #include "gpu/config/gpu_feature_type.h"
28 #include "gpu/config/gpu_info_collector.h" 28 #include "gpu/config/gpu_info_collector.h"
29 #include "gpu/config/gpu_util.h" 29 #include "gpu/config/gpu_util.h"
30 #include "ui/base/ui_base_switches.h" 30 #include "ui/base/ui_base_switches.h"
31 #include "ui/gl/gl_implementation.h" 31 #include "ui/gl/gl_implementation.h"
32 #include "ui/gl/gl_switches.h" 32 #include "ui/gl/gl_switches.h"
33 #include "ui/gl/gpu_switching_manager.h" 33 #include "ui/gl/gpu_switching_manager.h"
34 #include "webkit/common/webpreferences.h" 34 #include "webkit/glue/webpreferences.h"
35 #include "webkit/plugins/plugin_switches.h" 35 #include "webkit/plugins/plugin_switches.h"
36 36
37 #if defined(OS_MACOSX) 37 #if defined(OS_MACOSX)
38 #include <ApplicationServices/ApplicationServices.h> 38 #include <ApplicationServices/ApplicationServices.h>
39 #endif // OS_MACOSX 39 #endif // OS_MACOSX
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 #include "base/win/windows_version.h" 41 #include "base/win/windows_version.h"
42 #endif // OS_WIN 42 #endif // OS_WIN
43 #if defined(OS_ANDROID) 43 #if defined(OS_ANDROID)
44 #include "ui/gfx/android/device_display_info.h" 44 #include "ui/gfx/android/device_display_info.h"
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 int render_process_id, 1135 int render_process_id,
1136 int render_view_id, 1136 int render_view_id,
1137 ThreeDAPIType requester) { 1137 ThreeDAPIType requester) {
1138 GpuDataManagerImpl::UnlockedSession session(owner_); 1138 GpuDataManagerImpl::UnlockedSession session(owner_);
1139 observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs, 1139 observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs,
1140 url, render_process_id, render_view_id, requester); 1140 url, render_process_id, render_view_id, requester);
1141 } 1141 }
1142 1142
1143 } // namespace content 1143 } // namespace content
1144 1144
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698