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