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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 189853002: Remove --pnacl-dir override flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | chrome/common/chrome_switches.h » ('j') | 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) 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() 1457 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext()
1458 // instead? 1458 // instead?
1459 CloudPrintProxyServiceFactory::GetForProfile(profile_); 1459 CloudPrintProxyServiceFactory::GetForProfile(profile_);
1460 #endif 1460 #endif
1461 1461
1462 // Start watching all browser threads for responsiveness. 1462 // Start watching all browser threads for responsiveness.
1463 MetricsService::SetExecutionPhase(MetricsService::THREAD_WATCHER_START); 1463 MetricsService::SetExecutionPhase(MetricsService::THREAD_WATCHER_START);
1464 ThreadWatcherList::StartWatchingAll(parsed_command_line()); 1464 ThreadWatcherList::StartWatchingAll(parsed_command_line());
1465 1465
1466 #if !defined(DISABLE_NACL) 1466 #if !defined(DISABLE_NACL)
1467 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) {
1468 PathService::Override(chrome::DIR_PNACL_BASE,
1469 parsed_command_line().GetSwitchValuePath(
1470 switches::kPnaclDir));
1471 }
1472
1473 content::BrowserThread::PostTask( 1467 content::BrowserThread::PostTask(
1474 content::BrowserThread::IO, 1468 content::BrowserThread::IO,
1475 FROM_HERE, 1469 FROM_HERE,
1476 base::Bind(nacl::NaClProcessHost::EarlyStartup)); 1470 base::Bind(nacl::NaClProcessHost::EarlyStartup));
1477 #endif 1471 #endif
1478 1472
1479 // Make sure initial prefs are recorded 1473 // Make sure initial prefs are recorded
1480 PrefMetricsService::Factory::GetForProfile(profile_); 1474 PrefMetricsService::Factory::GetForProfile(profile_);
1481 1475
1482 PreBrowserStart(); 1476 PreBrowserStart();
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1690 chromeos::CrosSettings::Shutdown(); 1684 chromeos::CrosSettings::Shutdown();
1691 #endif 1685 #endif
1692 #endif 1686 #endif
1693 } 1687 }
1694 1688
1695 // Public members: 1689 // Public members:
1696 1690
1697 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1691 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1698 chrome_extra_parts_.push_back(parts); 1692 chrome_extra_parts_.push_back(parts);
1699 } 1693 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698