| 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 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1485 #if defined(OS_WIN) | 1485 #if defined(OS_WIN) |
| 1486 // We check this here because if the profile is OTR (chromeos possibility) | 1486 // We check this here because if the profile is OTR (chromeos possibility) |
| 1487 // it won't still be accessible after browser is destroyed. | 1487 // it won't still be accessible after browser is destroyed. |
| 1488 record_search_engine_ = do_first_run_tasks_ && !profile_->IsOffTheRecord(); | 1488 record_search_engine_ = do_first_run_tasks_ && !profile_->IsOffTheRecord(); |
| 1489 #endif | 1489 #endif |
| 1490 | 1490 |
| 1491 // Create the instance of the cloud print proxy service so that it can launch | 1491 // Create the instance of the cloud print proxy service so that it can launch |
| 1492 // the service process if needed. This is needed because the service process | 1492 // the service process if needed. This is needed because the service process |
| 1493 // might have shutdown because an update was available. | 1493 // might have shutdown because an update was available. |
| 1494 // TODO(torne): this should maybe be done with | 1494 // TODO(torne): this should maybe be done with |
| 1495 // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? | 1495 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() ins
tead? |
| 1496 #if !defined(OS_ANDROID) | 1496 #if !defined(OS_ANDROID) |
| 1497 CloudPrintProxyServiceFactory::GetForProfile(profile_); | 1497 CloudPrintProxyServiceFactory::GetForProfile(profile_); |
| 1498 #endif | 1498 #endif |
| 1499 | 1499 |
| 1500 // Start watching all browser threads for responsiveness. | 1500 // Start watching all browser threads for responsiveness. |
| 1501 ThreadWatcherList::StartWatchingAll(parsed_command_line()); | 1501 ThreadWatcherList::StartWatchingAll(parsed_command_line()); |
| 1502 | 1502 |
| 1503 #if !defined(DISABLE_NACL) | 1503 #if !defined(DISABLE_NACL) |
| 1504 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { | 1504 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { |
| 1505 PathService::Override(chrome::DIR_PNACL_BASE, | 1505 PathService::Override(chrome::DIR_PNACL_BASE, |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1808 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1808 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1809 uma_name += "_XP"; | 1809 uma_name += "_XP"; |
| 1810 | 1810 |
| 1811 uma_name += "_PreRead_"; | 1811 uma_name += "_PreRead_"; |
| 1812 uma_name += pre_read_percentage; | 1812 uma_name += pre_read_percentage; |
| 1813 AddPreReadHistogramTime(uma_name.c_str(), time); | 1813 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1814 } | 1814 } |
| 1815 #endif | 1815 #endif |
| 1816 #endif | 1816 #endif |
| 1817 } | 1817 } |
| OLD | NEW |