OLD | NEW |
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 <stdint.h> | 5 #include <stdint.h> |
6 #include <string.h> | 6 #include <string.h> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
497 } | 497 } |
498 } | 498 } |
499 #endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) | 499 #endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) |
500 | 500 |
501 } // namespace | 501 } // namespace |
502 | 502 |
503 void RegisterPepperFlashComponent(ComponentUpdateService* cus) { | 503 void RegisterPepperFlashComponent(ComponentUpdateService* cus) { |
504 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) | 504 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) |
505 // Component updated flash supersedes bundled flash therefore if that one | 505 // Component updated flash supersedes bundled flash therefore if that one |
506 // is disabled then this one should never install. | 506 // is disabled then this one should never install. |
507 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 507 base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) | 508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) |
509 return; | 509 return; |
510 BrowserThread::PostTask(BrowserThread::FILE, | 510 BrowserThread::PostTask(BrowserThread::FILE, |
511 FROM_HERE, | 511 FROM_HERE, |
512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); | 512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); |
513 #endif | 513 #endif |
514 } | 514 } |
515 | 515 |
516 } // namespace component_updater | 516 } // namespace component_updater |
OLD | NEW |