OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/pnacl/pnacl_component_installer.h" | 5 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/json/json_file_value_serializer.h" | 13 #include "base/json/json_file_value_serializer.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "base/version.h" | 18 #include "base/version.h" |
19 #include "base/win/windows_version.h" | 19 #include "base/win/windows_version.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
21 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/component_updater/component_updater_service.h" | 22 #include "chrome/browser/component_updater/component_updater_service.h" |
23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/profiles/profile_manager.h" | 24 #include "chrome/browser/profiles/profile_manager.h" |
25 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" |
26 #include "chrome/common/chrome_switches.h" | |
27 #include "chrome/common/omaha_query_params/omaha_query_params.h" | 26 #include "chrome/common/omaha_query_params/omaha_query_params.h" |
| 27 #include "chrome/nacl/nacl_switches.h" |
28 #include "content/public/browser/browser_thread.h" | 28 #include "content/public/browser/browser_thread.h" |
29 | 29 |
30 using chrome::OmahaQueryParams; | 30 using chrome::OmahaQueryParams; |
31 using content::BrowserThread; | 31 using content::BrowserThread; |
32 | 32 |
33 namespace { | 33 namespace { |
34 | 34 |
35 // If PNaCl isn't installed yet, but a user is running chrome with | 35 // If PNaCl isn't installed yet, but a user is running chrome with |
36 // --enable-pnacl, this is the amount of time to wait before starting | 36 // --enable-pnacl, this is the amount of time to wait before starting |
37 // a background install. | 37 // a background install. |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 // No need to check the commandline flags again here. | 428 // No need to check the commandline flags again here. |
429 // We could only have gotten here after RegisterPnaclComponent | 429 // We could only have gotten here after RegisterPnaclComponent |
430 // found --enable-pnacl, since that is where we create the profile_observer_, | 430 // found --enable-pnacl, since that is where we create the profile_observer_, |
431 // which in turn calls ReRegisterPnacl. | 431 // which in turn calls ReRegisterPnacl. |
432 DCHECK(per_user_); | 432 DCHECK(per_user_); |
433 // Figure out profile information, before proceeding to look for files. | 433 // Figure out profile information, before proceeding to look for files. |
434 BrowserThread::PostTask( | 434 BrowserThread::PostTask( |
435 BrowserThread::UI, FROM_HERE, | 435 BrowserThread::UI, FROM_HERE, |
436 base::Bind(&GetProfileInformation, this)); | 436 base::Bind(&GetProfileInformation, this)); |
437 } | 437 } |
OLD | NEW |