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

Side by Side Diff: chrome/browser/component_updater/pepper_flash_component_installer.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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/browser/component_updater/DEPS ('k') | chrome/renderer/DEPS » ('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) 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 "chrome/browser/component_updater/flash_component_installer.h" 5 #include "chrome/browser/component_updater/flash_component_installer.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/component_updater/component_updater_service.h" 27 #include "chrome/browser/component_updater/component_updater_service.h"
28 #include "chrome/browser/plugins/plugin_prefs.h" 28 #include "chrome/browser/plugins/plugin_prefs.h"
29 #include "chrome/common/chrome_constants.h" 29 #include "chrome/common/chrome_constants.h"
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/pepper_flash.h" 32 #include "chrome/common/pepper_flash.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/plugin_service.h" 34 #include "content/public/browser/plugin_service.h"
35 #include "content/public/common/pepper_plugin_info.h" 35 #include "content/public/common/pepper_plugin_info.h"
36 #include "ppapi/c/private/ppb_pdf.h" 36 #include "ppapi/c/private/ppb_pdf.h"
37 #include "ppapi/shared_impl/ppapi_permissions.h"
37 #include "webkit/common/plugins/ppapi/ppapi_utils.h" 38 #include "webkit/common/plugins/ppapi/ppapi_utils.h"
38 #include "webkit/plugins/plugin_constants.h" 39 #include "webkit/plugins/plugin_constants.h"
39 40
40 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
41 42
42 using content::BrowserThread; 43 using content::BrowserThread;
43 using content::PluginService; 44 using content::PluginService;
44 45
45 namespace { 46 namespace {
46 47
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) 397 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
397 // Component updated flash supersedes bundled flash therefore if that one 398 // Component updated flash supersedes bundled flash therefore if that one
398 // is disabled then this one should never install. 399 // is disabled then this one should never install.
399 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 400 CommandLine* cmd_line = CommandLine::ForCurrentProcess();
400 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) 401 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash))
401 return; 402 return;
402 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 403 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
403 base::Bind(&StartPepperFlashUpdateRegistration, cus)); 404 base::Bind(&StartPepperFlashUpdateRegistration, cus));
404 #endif 405 #endif
405 } 406 }
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/DEPS ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698