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

Side by Side Diff: content/renderer/pepper/plugin_module.cc

Issue 22394006: Get rid of webkit/plugins/plugin_switches.* and move them to content/public/common/content_switches… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 4 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/renderer/pepper/plugin_module.h" 5 #include "content/renderer/pepper/plugin_module.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 #include "ppapi/shared_impl/callback_tracker.h" 131 #include "ppapi/shared_impl/callback_tracker.h"
132 #include "ppapi/shared_impl/ppapi_preferences.h" 132 #include "ppapi/shared_impl/ppapi_preferences.h"
133 #include "ppapi/shared_impl/ppapi_switches.h" 133 #include "ppapi/shared_impl/ppapi_switches.h"
134 #include "ppapi/shared_impl/ppb_input_event_shared.h" 134 #include "ppapi/shared_impl/ppb_input_event_shared.h"
135 #include "ppapi/shared_impl/ppb_opengles2_shared.h" 135 #include "ppapi/shared_impl/ppb_opengles2_shared.h"
136 #include "ppapi/shared_impl/ppb_var_shared.h" 136 #include "ppapi/shared_impl/ppb_var_shared.h"
137 #include "ppapi/shared_impl/time_conversion.h" 137 #include "ppapi/shared_impl/time_conversion.h"
138 #include "ppapi/thunk/enter.h" 138 #include "ppapi/thunk/enter.h"
139 #include "ppapi/thunk/ppb_graphics_2d_api.h" 139 #include "ppapi/thunk/ppb_graphics_2d_api.h"
140 #include "ppapi/thunk/thunk.h" 140 #include "ppapi/thunk/thunk.h"
141 #include "webkit/plugins/plugin_switches.h"
142 141
143 using ppapi::InputEventData; 142 using ppapi::InputEventData;
144 using ppapi::PpapiGlobals; 143 using ppapi::PpapiGlobals;
145 using ppapi::TimeTicksToPPTimeTicks; 144 using ppapi::TimeTicksToPPTimeTicks;
146 using ppapi::TimeToPPTime; 145 using ppapi::TimeToPPTime;
147 using ppapi::thunk::EnterResource; 146 using ppapi::thunk::EnterResource;
148 using ppapi::thunk::PPB_Graphics2D_API; 147 using ppapi::thunk::PPB_Graphics2D_API;
149 using ppapi::thunk::PPB_InputEvent_API; 148 using ppapi::thunk::PPB_InputEvent_API;
150 149
151 namespace content { 150 namespace content {
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 channel_handle, 734 channel_handle,
736 peer_pid, 735 peer_pid,
737 plugin_child_id, 736 plugin_child_id,
738 false)) // is_external = false 737 false)) // is_external = false
739 return scoped_refptr<PluginModule>(); 738 return scoped_refptr<PluginModule>();
740 739
741 return module; 740 return module;
742 } 741 }
743 742
744 } // namespace content 743 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/host_globals.cc ('k') | content/renderer/pepper/ppb_gpu_blacklist_private_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698