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

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

Issue 7671013: Fix broken tree (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | « no previous file | no next file » | 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/browser/component_updater/pepper_flash_component_installer.h" 5 #include "chrome/browser/component_updater/pepper_flash_component_installer.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/stringprintf.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "chrome/browser/component_updater/component_updater_service.h" 16 #include "chrome/browser/component_updater/component_updater_service.h"
16 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
17 #include "content/browser/browser_thread.h" 18 #include "content/browser/browser_thread.h"
18 #include "content/common/pepper_plugin_registry.h" 19 #include "content/common/pepper_plugin_registry.h"
19 #include "webkit/plugins/npapi/plugin_list.h" 20 #include "webkit/plugins/npapi/plugin_list.h"
20 21
21 namespace { 22 namespace {
22 23
23 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb. 24 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 NewRunnableFunction(&FinishPepperFlashUpdateRegistration, cus, version)); 233 NewRunnableFunction(&FinishPepperFlashUpdateRegistration, cus, version));
233 } 234 }
234 235
235 void RegisterPepperFlashComponent(ComponentUpdateService* cus) { 236 void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
236 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) 237 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
237 // TODO(cpu): support Mac and Linux flash pepper. 238 // TODO(cpu): support Mac and Linux flash pepper.
238 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 239 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
239 NewRunnableFunction(&StartPepperFlashUpdateRegistration, cus)); 240 NewRunnableFunction(&StartPepperFlashUpdateRegistration, cus));
240 #endif 241 #endif
241 } 242 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698