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

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 8348026: Add a component installer for Portable NaCl. Registration of installer is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years 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) 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/ui/browser_init.h" 5 #include "chrome/browser/ui/browser_init.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 10 matching lines...) Expand all
21 #include "base/threading/thread_restrictions.h" 21 #include "base/threading/thread_restrictions.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "chrome/browser/automation/automation_provider.h" 23 #include "chrome/browser/automation/automation_provider.h"
24 #include "chrome/browser/automation/automation_provider_list.h" 24 #include "chrome/browser/automation/automation_provider_list.h"
25 #include "chrome/browser/automation/chrome_frame_automation_provider.h" 25 #include "chrome/browser/automation/chrome_frame_automation_provider.h"
26 #include "chrome/browser/automation/testing_automation_provider.h" 26 #include "chrome/browser/automation/testing_automation_provider.h"
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/component_updater/component_updater_service.h" 28 #include "chrome/browser/component_updater/component_updater_service.h"
29 #include "chrome/browser/component_updater/flash_component_installer.h" 29 #include "chrome/browser/component_updater/flash_component_installer.h"
30 #include "chrome/browser/component_updater/recovery_component_installer.h" 30 #include "chrome/browser/component_updater/recovery_component_installer.h"
31 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
31 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 32 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
32 #include "chrome/browser/defaults.h" 33 #include "chrome/browser/defaults.h"
33 #include "chrome/browser/extensions/extension_creator.h" 34 #include "chrome/browser/extensions/extension_creator.h"
34 #include "chrome/browser/extensions/extension_service.h" 35 #include "chrome/browser/extensions/extension_service.h"
35 #include "chrome/browser/extensions/pack_extension_job.h" 36 #include "chrome/browser/extensions/pack_extension_job.h"
36 #include "chrome/browser/first_run/first_run.h" 37 #include "chrome/browser/first_run/first_run.h"
37 #include "chrome/browser/infobars/infobar_tab_helper.h" 38 #include "chrome/browser/infobars/infobar_tab_helper.h"
38 #include "chrome/browser/net/crl_set_fetcher.h" 39 #include "chrome/browser/net/crl_set_fetcher.h"
39 #include "chrome/browser/net/predictor.h" 40 #include "chrome/browser/net/predictor.h"
40 #include "chrome/browser/net/url_fixer_upper.h" 41 #include "chrome/browser/net/url_fixer_upper.h"
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 // file IO to know you existing component version. 484 // file IO to know you existing component version.
484 RegisterRecoveryComponent(cus, g_browser_process->local_state()); 485 RegisterRecoveryComponent(cus, g_browser_process->local_state());
485 RegisterPepperFlashComponent(cus); 486 RegisterPepperFlashComponent(cus);
486 RegisterNPAPIFlashComponent(cus); 487 RegisterNPAPIFlashComponent(cus);
487 488
488 // CRLSetFetcher attempts to load a CRL set from either the local disk or 489 // CRLSetFetcher attempts to load a CRL set from either the local disk or
489 // network. 490 // network.
490 if (command_line.HasSwitch(switches::kEnableCRLSets)) 491 if (command_line.HasSwitch(switches::kEnableCRLSets))
491 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); 492 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
492 493
494 // This developer version of Pnacl should only be installed for developers.
495 if (command_line.HasSwitch(switches::kEnablePnacl)) {
496 RegisterPnaclComponent(cus);
497 }
498
493 cus->Start(); 499 cus->Start();
494 } 500 }
495 501
496 } // namespace 502 } // namespace
497 503
498 504
499 // BrowserInit ---------------------------------------------------------------- 505 // BrowserInit ----------------------------------------------------------------
500 506
501 bool BrowserInit::was_restarted_ = false; 507 bool BrowserInit::was_restarted_ = false;
502 bool BrowserInit::was_restarted_read_ = false; 508 bool BrowserInit::was_restarted_read_ = false;
(...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 1544
1539 Profile* profile = ProfileManager::GetLastUsedProfile(); 1545 Profile* profile = ProfileManager::GetLastUsedProfile();
1540 if (!profile) { 1546 if (!profile) {
1541 // We should only be able to get here if the profile already exists and 1547 // We should only be able to get here if the profile already exists and
1542 // has been created. 1548 // has been created.
1543 NOTREACHED(); 1549 NOTREACHED();
1544 return; 1550 return;
1545 } 1551 }
1546 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); 1552 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL);
1547 } 1553 }
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/pnacl/pnacl_component_installer.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698