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

Side by Side Diff: content/renderer/pepper/host_globals.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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/pepper/plugin_module.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/host_globals.h" 5 #include "content/renderer/pepper/host_globals.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/rand_util.h" 11 #include "base/rand_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/task_runner.h" 13 #include "base/task_runner.h"
14 #include "content/public/common/content_switches.h"
14 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 15 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
15 #include "content/renderer/pepper/plugin_module.h" 16 #include "content/renderer/pepper/plugin_module.h"
16 #include "content/renderer/render_thread_impl.h" 17 #include "content/renderer/render_thread_impl.h"
17 #include "ppapi/shared_impl/api_id.h" 18 #include "ppapi/shared_impl/api_id.h"
18 #include "ppapi/shared_impl/id_assignment.h" 19 #include "ppapi/shared_impl/id_assignment.h"
19 #include "third_party/WebKit/public/platform/WebString.h" 20 #include "third_party/WebKit/public/platform/WebString.h"
20 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 21 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
21 #include "third_party/WebKit/public/web/WebDocument.h" 22 #include "third_party/WebKit/public/web/WebDocument.h"
22 #include "third_party/WebKit/public/web/WebElement.h" 23 #include "third_party/WebKit/public/web/WebElement.h"
23 #include "third_party/WebKit/public/web/WebFrame.h" 24 #include "third_party/WebKit/public/web/WebFrame.h"
24 #include "third_party/WebKit/public/web/WebPluginContainer.h" 25 #include "third_party/WebKit/public/web/WebPluginContainer.h"
25 #include "webkit/plugins/plugin_switches.h"
26 26
27 using ppapi::CheckIdType; 27 using ppapi::CheckIdType;
28 using ppapi::MakeTypedId; 28 using ppapi::MakeTypedId;
29 using ppapi::PPIdType; 29 using ppapi::PPIdType;
30 using ppapi::ResourceTracker; 30 using ppapi::ResourceTracker;
31 using WebKit::WebConsoleMessage; 31 using WebKit::WebConsoleMessage;
32 using WebKit::WebString; 32 using WebKit::WebString;
33 33
34 namespace content { 34 namespace content {
35 35
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 if (found == instance_map_.end()) 271 if (found == instance_map_.end())
272 return NULL; 272 return NULL;
273 return found->second; 273 return found->second;
274 } 274 }
275 275
276 bool HostGlobals::IsHostGlobals() const { 276 bool HostGlobals::IsHostGlobals() const {
277 return true; 277 return true;
278 } 278 }
279 279
280 } // namespace content 280 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/pepper/plugin_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698