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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 #include "net/base/net_module.h" | 137 #include "net/base/net_module.h" |
138 #include "net/base/sdch_manager.h" | 138 #include "net/base/sdch_manager.h" |
139 #include "net/cookies/cookie_monster.h" | 139 #include "net/cookies/cookie_monster.h" |
140 #include "net/http/http_network_layer.h" | 140 #include "net/http/http_network_layer.h" |
141 #include "net/http/http_stream_factory.h" | 141 #include "net/http/http_stream_factory.h" |
142 #include "net/url_request/url_request.h" | 142 #include "net/url_request/url_request.h" |
143 #include "ui/base/l10n/l10n_util.h" | 143 #include "ui/base/l10n/l10n_util.h" |
144 #include "ui/base/layout.h" | 144 #include "ui/base/layout.h" |
145 #include "ui/base/resource/resource_bundle.h" | 145 #include "ui/base/resource/resource_bundle.h" |
146 | 146 |
147 #if defined(OS_ANDROID) | |
148 #include "chrome/browser/metrics/thread_watcher_android.h" | |
149 #endif | |
150 | |
151 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 147 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
152 #include "chrome/browser/first_run/upgrade_util_linux.h" | 148 #include "chrome/browser/first_run/upgrade_util_linux.h" |
153 #include "chrome/browser/sxs_linux.h" | 149 #include "chrome/browser/sxs_linux.h" |
154 #endif | 150 #endif |
155 | 151 |
156 #if defined(OS_CHROMEOS) | 152 #if defined(OS_CHROMEOS) |
157 #include "chrome/browser/chromeos/settings/cros_settings.h" | 153 #include "chrome/browser/chromeos/settings/cros_settings.h" |
158 #include "chromeos/chromeos_switches.h" | 154 #include "chromeos/chromeos_switches.h" |
159 #include "chromeos/settings/cros_settings_names.h" | 155 #include "chromeos/settings/cros_settings_names.h" |
160 #endif | 156 #endif |
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1460 // TODO(torne): this should maybe be done with | 1456 // TODO(torne): this should maybe be done with |
1461 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() | 1457 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() |
1462 // instead? | 1458 // instead? |
1463 CloudPrintProxyServiceFactory::GetForProfile(profile_); | 1459 CloudPrintProxyServiceFactory::GetForProfile(profile_); |
1464 #endif | 1460 #endif |
1465 | 1461 |
1466 // Start watching all browser threads for responsiveness. | 1462 // Start watching all browser threads for responsiveness. |
1467 MetricsService::SetExecutionPhase(MetricsService::THREAD_WATCHER_START); | 1463 MetricsService::SetExecutionPhase(MetricsService::THREAD_WATCHER_START); |
1468 ThreadWatcherList::StartWatchingAll(parsed_command_line()); | 1464 ThreadWatcherList::StartWatchingAll(parsed_command_line()); |
1469 | 1465 |
1470 #if defined(OS_ANDROID) | |
1471 ThreadWatcherAndroid::RegisterApplicationStatusListener(); | |
1472 #endif | |
1473 | |
1474 #if !defined(DISABLE_NACL) | 1466 #if !defined(DISABLE_NACL) |
1475 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { | 1467 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { |
1476 PathService::Override(chrome::DIR_PNACL_BASE, | 1468 PathService::Override(chrome::DIR_PNACL_BASE, |
1477 parsed_command_line().GetSwitchValuePath( | 1469 parsed_command_line().GetSwitchValuePath( |
1478 switches::kPnaclDir)); | 1470 switches::kPnaclDir)); |
1479 } | 1471 } |
1480 | 1472 |
1481 content::BrowserThread::PostTask( | 1473 content::BrowserThread::PostTask( |
1482 content::BrowserThread::IO, | 1474 content::BrowserThread::IO, |
1483 FROM_HERE, | 1475 FROM_HERE, |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1698 chromeos::CrosSettings::Shutdown(); | 1690 chromeos::CrosSettings::Shutdown(); |
1699 #endif | 1691 #endif |
1700 #endif | 1692 #endif |
1701 } | 1693 } |
1702 | 1694 |
1703 // Public members: | 1695 // Public members: |
1704 | 1696 |
1705 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1697 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1706 chrome_extra_parts_.push_back(parts); | 1698 chrome_extra_parts_.push_back(parts); |
1707 } | 1699 } |
OLD | NEW |