| 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 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1179 void ChromeBrowserMainParts::PostProfileInit() { | 1179 void ChromeBrowserMainParts::PostProfileInit() { |
| 1180 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); | 1180 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); |
| 1181 | 1181 |
| 1182 #if BUILDFLAG(ANDROID_JAVA_UI) | 1182 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 1183 DevToolsDiscoveryProviderAndroid::Install(); | 1183 DevToolsDiscoveryProviderAndroid::Install(); |
| 1184 #else | 1184 #else |
| 1185 ChromeDevToolsDiscoveryProvider::Install(); | 1185 ChromeDevToolsDiscoveryProvider::Install(); |
| 1186 #endif // BUILDFLAG(ANDROID_JAVA_UI) | 1186 #endif // BUILDFLAG(ANDROID_JAVA_UI) |
| 1187 | 1187 |
| 1188 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); | 1188 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); |
| 1189 if (parsed_command_line().HasSwitch(::switches::kAutoOpenDevToolsForTabs)) |
| 1190 g_browser_process->CreateDevToolsAutoOpener(); |
| 1191 |
| 1189 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1192 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
| 1190 chrome_extra_parts_[i]->PostProfileInit(); | 1193 chrome_extra_parts_[i]->PostProfileInit(); |
| 1191 } | 1194 } |
| 1192 | 1195 |
| 1193 void ChromeBrowserMainParts::PreBrowserStart() { | 1196 void ChromeBrowserMainParts::PreBrowserStart() { |
| 1194 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); | 1197 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); |
| 1195 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1198 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
| 1196 chrome_extra_parts_[i]->PreBrowserStart(); | 1199 chrome_extra_parts_[i]->PreBrowserStart(); |
| 1197 | 1200 |
| 1198 three_d_observer_.reset(new ThreeDAPIObserver()); | 1201 three_d_observer_.reset(new ThreeDAPIObserver()); |
| (...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1891 chromeos::CrosSettings::Shutdown(); | 1894 chromeos::CrosSettings::Shutdown(); |
| 1892 #endif // defined(OS_CHROMEOS) | 1895 #endif // defined(OS_CHROMEOS) |
| 1893 #endif // defined(OS_ANDROID) | 1896 #endif // defined(OS_ANDROID) |
| 1894 } | 1897 } |
| 1895 | 1898 |
| 1896 // Public members: | 1899 // Public members: |
| 1897 | 1900 |
| 1898 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1901 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1899 chrome_extra_parts_.push_back(parts); | 1902 chrome_extra_parts_.push_back(parts); |
| 1900 } | 1903 } |
| OLD | NEW |