| 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 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 1769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1780 variations_service->PerformPreMainMessageLoopStartup(); | 1780 variations_service->PerformPreMainMessageLoopStartup(); |
| 1781 | 1781 |
| 1782 translate::TranslateDownloadManager::RequestLanguageList( | 1782 translate::TranslateDownloadManager::RequestLanguageList( |
| 1783 profile_->GetPrefs()); | 1783 profile_->GetPrefs()); |
| 1784 } | 1784 } |
| 1785 } | 1785 } |
| 1786 run_message_loop_ = started; | 1786 run_message_loop_ = started; |
| 1787 browser_creator_.reset(); | 1787 browser_creator_.reset(); |
| 1788 | 1788 |
| 1789 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) // http://crbug.com/426393 | 1789 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) // http://crbug.com/426393 |
| 1790 if (g_browser_process->metrics_service()->reporting_active()) | 1790 content::StartPowerUsageMonitor(); |
| 1791 content::StartPowerUsageMonitor(); | |
| 1792 #endif // !defined(OS_LINUX) || defined(OS_CHROMEOS) | 1791 #endif // !defined(OS_LINUX) || defined(OS_CHROMEOS) |
| 1793 | 1792 |
| 1794 process_power_collector_.reset(new ProcessPowerCollector); | 1793 process_power_collector_.reset(new ProcessPowerCollector); |
| 1795 process_power_collector_->Initialize(); | 1794 process_power_collector_->Initialize(); |
| 1796 #endif // !defined(OS_ANDROID) | 1795 #endif // !defined(OS_ANDROID) |
| 1797 | 1796 |
| 1798 PostBrowserStart(); | 1797 PostBrowserStart(); |
| 1799 | 1798 |
| 1800 if (parameters().ui_task) { | 1799 if (parameters().ui_task) { |
| 1801 parameters().ui_task->Run(); | 1800 parameters().ui_task->Run(); |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1942 chromeos::CrosSettings::Shutdown(); | 1941 chromeos::CrosSettings::Shutdown(); |
| 1943 #endif // defined(OS_CHROMEOS) | 1942 #endif // defined(OS_CHROMEOS) |
| 1944 #endif // defined(OS_ANDROID) | 1943 #endif // defined(OS_ANDROID) |
| 1945 } | 1944 } |
| 1946 | 1945 |
| 1947 // Public members: | 1946 // Public members: |
| 1948 | 1947 |
| 1949 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1948 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1950 chrome_extra_parts_.push_back(parts); | 1949 chrome_extra_parts_.push_back(parts); |
| 1951 } | 1950 } |
| OLD | NEW |