| 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/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 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1459 startup_watcher_->Arm(base::TimeDelta::FromSeconds(300)); | 1459 startup_watcher_->Arm(base::TimeDelta::FromSeconds(300)); |
| 1460 | 1460 |
| 1461 // On mobile, need for clean shutdown arises only when the application comes | 1461 // On mobile, need for clean shutdown arises only when the application comes |
| 1462 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). | 1462 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). |
| 1463 // http://crbug.com/179143 | 1463 // http://crbug.com/179143 |
| 1464 #if !defined(OS_ANDROID) | 1464 #if !defined(OS_ANDROID) |
| 1465 // Start watching for a hang. | 1465 // Start watching for a hang. |
| 1466 MetricsService::LogNeedForCleanShutdown(); | 1466 MetricsService::LogNeedForCleanShutdown(); |
| 1467 #endif | 1467 #endif |
| 1468 | 1468 |
| 1469 #if defined(ENABLE_FULL_PRINTING) |
| 1469 // Create the instance of the cloud print proxy service so that it can launch | 1470 // Create the instance of the cloud print proxy service so that it can launch |
| 1470 // the service process if needed. This is needed because the service process | 1471 // the service process if needed. This is needed because the service process |
| 1471 // might have shutdown because an update was available. | 1472 // might have shutdown because an update was available. |
| 1472 // TODO(torne): this should maybe be done with | 1473 // TODO(torne): this should maybe be done with |
| 1473 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() | 1474 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() |
| 1474 // instead? | 1475 // instead? |
| 1475 #if !defined(OS_ANDROID) | |
| 1476 CloudPrintProxyServiceFactory::GetForProfile(profile_); | 1476 CloudPrintProxyServiceFactory::GetForProfile(profile_); |
| 1477 #endif | 1477 #endif |
| 1478 | 1478 |
| 1479 // Start watching all browser threads for responsiveness. | 1479 // Start watching all browser threads for responsiveness. |
| 1480 ThreadWatcherList::StartWatchingAll(parsed_command_line()); | 1480 ThreadWatcherList::StartWatchingAll(parsed_command_line()); |
| 1481 | 1481 |
| 1482 #if !defined(DISABLE_NACL) | 1482 #if !defined(DISABLE_NACL) |
| 1483 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { | 1483 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { |
| 1484 PathService::Override(chrome::DIR_PNACL_BASE, | 1484 PathService::Override(chrome::DIR_PNACL_BASE, |
| 1485 parsed_command_line().GetSwitchValuePath( | 1485 parsed_command_line().GetSwitchValuePath( |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1700 chromeos::CrosSettings::Shutdown(); | 1700 chromeos::CrosSettings::Shutdown(); |
| 1701 #endif | 1701 #endif |
| 1702 #endif | 1702 #endif |
| 1703 } | 1703 } |
| 1704 | 1704 |
| 1705 // Public members: | 1705 // Public members: |
| 1706 | 1706 |
| 1707 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1707 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1708 chrome_extra_parts_.push_back(parts); | 1708 chrome_extra_parts_.push_back(parts); |
| 1709 } | 1709 } |
| OLD | NEW |