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

Side by Side Diff: chrome/renderer/chrome_ppapi_interfaces.cc

Issue 8277018: Move content_switches to content\public\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « chrome/renderer/benchmarking_extension.cc ('k') | chrome/test/gpu/webgl_conformance_tests.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/renderer/chrome_ppapi_interfaces.h" 5 #include "chrome/renderer/chrome_ppapi_interfaces.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/rand_util_c.h" 9 #include "base/rand_util_c.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/common/render_messages.h" 11 #include "chrome/common/render_messages.h"
12 #include "chrome/renderer/chrome_ppb_pdf_impl.h" 12 #include "chrome/renderer/chrome_ppb_pdf_impl.h"
13 #include "content/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 #include "content/public/renderer/render_thread.h" 14 #include "content/public/renderer/render_thread.h"
15 #include "ppapi/c/private/ppb_nacl_private.h" 15 #include "ppapi/c/private/ppb_nacl_private.h"
16 #include "ppapi/c/private/ppb_pdf.h" 16 #include "ppapi/c/private/ppb_pdf.h"
17 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 17 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
18 18
19 #if !defined(DISABLE_NACL) 19 #if !defined(DISABLE_NACL)
20 #include "native_client/src/shared/imc/nacl_imc.h" 20 #include "native_client/src/shared/imc/nacl_imc.h"
21 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h" 21 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
22 #endif 22 #endif
23 23
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 94 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
95 } 95 }
96 96
97 void UninitializePPAPI() { 97 void UninitializePPAPI() {
98 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager = 98 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager =
99 webkit::ppapi::PpapiInterfaceFactoryManager::GetInstance(); 99 webkit::ppapi::PpapiInterfaceFactoryManager::GetInstance();
100 factory_manager->UnregisterFactory(ChromePPAPIInterfaceFactory); 100 factory_manager->UnregisterFactory(ChromePPAPIInterfaceFactory);
101 } 101 }
102 102
103 } // namespace chrome 103 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/benchmarking_extension.cc ('k') | chrome/test/gpu/webgl_conformance_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698