| 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 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1923 browser_process_->variations_service(); | 1923 browser_process_->variations_service(); |
| 1924 if (variations_service) | 1924 if (variations_service) |
| 1925 variations_service->PerformPreMainMessageLoopStartup(); | 1925 variations_service->PerformPreMainMessageLoopStartup(); |
| 1926 | 1926 |
| 1927 translate::TranslateDownloadManager::RequestLanguageList( | 1927 translate::TranslateDownloadManager::RequestLanguageList( |
| 1928 profile_->GetPrefs()); | 1928 profile_->GetPrefs()); |
| 1929 } | 1929 } |
| 1930 } | 1930 } |
| 1931 run_message_loop_ = started; | 1931 run_message_loop_ = started; |
| 1932 browser_creator_.reset(); | 1932 browser_creator_.reset(); |
| 1933 | |
| 1934 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) | |
| 1935 // Collects power-related UMA stats for Windows, Mac, and ChromeOS. | |
| 1936 // Linux is not supported (crbug.com/426393). | |
| 1937 power_usage_monitor_.reset(new PowerUsageMonitor()); | |
| 1938 power_usage_monitor_->Start(); | |
| 1939 #endif // !defined(OS_LINUX) || defined(OS_CHROMEOS) | |
| 1940 | |
| 1941 #endif // !defined(OS_ANDROID) | 1933 #endif // !defined(OS_ANDROID) |
| 1942 | 1934 |
| 1943 PostBrowserStart(); | 1935 PostBrowserStart(); |
| 1944 | 1936 |
| 1945 if (parameters().ui_task) { | 1937 if (parameters().ui_task) { |
| 1946 parameters().ui_task->Run(); | 1938 parameters().ui_task->Run(); |
| 1947 delete parameters().ui_task; | 1939 delete parameters().ui_task; |
| 1948 run_message_loop_ = false; | 1940 run_message_loop_ = false; |
| 1949 } | 1941 } |
| 1950 | 1942 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2112 chromeos::CrosSettings::Shutdown(); | 2104 chromeos::CrosSettings::Shutdown(); |
| 2113 #endif // defined(OS_CHROMEOS) | 2105 #endif // defined(OS_CHROMEOS) |
| 2114 #endif // defined(OS_ANDROID) | 2106 #endif // defined(OS_ANDROID) |
| 2115 } | 2107 } |
| 2116 | 2108 |
| 2117 // Public members: | 2109 // Public members: |
| 2118 | 2110 |
| 2119 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2111 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2120 chrome_extra_parts_.push_back(parts); | 2112 chrome_extra_parts_.push_back(parts); |
| 2121 } | 2113 } |
| OLD | NEW |