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

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

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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
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
11 #include "base/base_paths.h" 11 #include "base/base_paths.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/string_util.h" 19 #include "base/string_util.h"
20 #include "base/stringprintf.h" 20 #include "base/stringprintf.h"
21 #include "base/strings/string_split.h" 21 #include "base/strings/string_split.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "base/values.h" 23 #include "base/values.h"
24 #include "base/version.h" 24 #include "base/version.h"
25 #include "build/build_config.h" 25 #include "build/build_config.h"
26 #include "chrome/browser/component_updater/component_updater_service.h" 26 #include "chrome/browser/component_updater/component_updater_service.h"
27 #include "chrome/browser/plugins/plugin_prefs.h" 27 #include "chrome/browser/plugins/plugin_prefs.h"
28 #include "chrome/common/chrome_constants.h" 28 #include "chrome/common/chrome_constants.h"
29 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
30 #include "chrome/common/chrome_switches.h"
31 #include "chrome/common/pepper_flash.h" 30 #include "chrome/common/pepper_flash.h"
31 #include "chrome/nacl/nacl_switches.h"
32 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
33 #include "content/public/browser/plugin_service.h" 33 #include "content/public/browser/plugin_service.h"
34 #include "content/public/common/pepper_plugin_info.h" 34 #include "content/public/common/pepper_plugin_info.h"
35 #include "ppapi/c/private/ppb_pdf.h" 35 #include "ppapi/c/private/ppb_pdf.h"
36 #include "webkit/common/plugins/ppapi/ppapi_utils.h" 36 #include "webkit/common/plugins/ppapi/ppapi_utils.h"
37 #include "webkit/plugins/plugin_constants.h" 37 #include "webkit/plugins/plugin_constants.h"
38 38
39 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 39 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
40 40
41 using content::BrowserThread; 41 using content::BrowserThread;
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) 387 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
388 // Component updated flash supersedes bundled flash therefore if that one 388 // Component updated flash supersedes bundled flash therefore if that one
389 // is disabled then this one should never install. 389 // is disabled then this one should never install.
390 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 390 CommandLine* cmd_line = CommandLine::ForCurrentProcess();
391 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) 391 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash))
392 return; 392 return;
393 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 393 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
394 base::Bind(&StartPepperFlashUpdateRegistration, cus)); 394 base::Bind(&StartPepperFlashUpdateRegistration, cus));
395 #endif 395 #endif
396 } 396 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698