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

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

Issue 138553004: Move component updater artifacts into component_updater namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 "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 25 matching lines...) Expand all
36 #include "content/public/common/content_constants.h" 36 #include "content/public/common/content_constants.h"
37 #include "content/public/common/pepper_plugin_info.h" 37 #include "content/public/common/pepper_plugin_info.h"
38 #include "ppapi/c/private/ppb_pdf.h" 38 #include "ppapi/c/private/ppb_pdf.h"
39 #include "ppapi/shared_impl/ppapi_permissions.h" 39 #include "ppapi/shared_impl/ppapi_permissions.h"
40 40
41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
42 42
43 using content::BrowserThread; 43 using content::BrowserThread;
44 using content::PluginService; 44 using content::PluginService;
45 45
46 namespace component_updater {
47
46 namespace { 48 namespace {
47 49
48 // File name of the Pepper Flash component manifest on different platforms. 50 // File name of the Pepper Flash component manifest on different platforms.
49 const char kPepperFlashManifestName[] = "Flapper"; 51 const char kPepperFlashManifestName[] = "Flapper";
50 52
51 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) 53 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
52 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb. 54 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
53 const uint8 kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20, 55 const uint8 kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
54 0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11, 56 0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
55 0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70, 57 0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70,
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) 402 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
401 // Component updated flash supersedes bundled flash therefore if that one 403 // Component updated flash supersedes bundled flash therefore if that one
402 // is disabled then this one should never install. 404 // is disabled then this one should never install.
403 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 405 CommandLine* cmd_line = CommandLine::ForCurrentProcess();
404 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) 406 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash))
405 return; 407 return;
406 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 408 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
407 base::Bind(&StartPepperFlashUpdateRegistration, cus)); 409 base::Bind(&StartPepperFlashUpdateRegistration, cus));
408 #endif 410 #endif
409 } 411 }
412
413 } // namespace component_updater
414
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698