Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 2272213003: DevTools: remove devtools_discovery (merged into content). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <algorithm> 10 #include <algorithm>
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 #include "net/http/http_stream_factory.h" 169 #include "net/http/http_stream_factory.h"
170 #include "net/url_request/url_request.h" 170 #include "net/url_request/url_request.h"
171 #include "ui/base/l10n/l10n_util.h" 171 #include "ui/base/l10n/l10n_util.h"
172 #include "ui/base/layout.h" 172 #include "ui/base/layout.h"
173 #include "ui/base/material_design/material_design_controller.h" 173 #include "ui/base/material_design/material_design_controller.h"
174 #include "ui/base/resource/resource_bundle.h" 174 #include "ui/base/resource/resource_bundle.h"
175 #include "ui/strings/grit/app_locale_settings.h" 175 #include "ui/strings/grit/app_locale_settings.h"
176 176
177 #if BUILDFLAG(ANDROID_JAVA_UI) 177 #if BUILDFLAG(ANDROID_JAVA_UI)
178 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" 178 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
179 #else
180 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"
181 #endif 179 #endif
182 180
183 #if defined(OS_ANDROID) 181 #if defined(OS_ANDROID)
184 #include "chrome/browser/metrics/thread_watcher_android.h" 182 #include "chrome/browser/metrics/thread_watcher_android.h"
185 #include "ui/base/resource/resource_bundle_android.h" 183 #include "ui/base/resource/resource_bundle_android.h"
186 #else 184 #else
187 #include "chrome/browser/feedback/feedback_profile_observer.h" 185 #include "chrome/browser/feedback/feedback_profile_observer.h"
188 #endif // defined(OS_ANDROID) 186 #endif // defined(OS_ANDROID)
189 187
190 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 188 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 #endif // defined(ENABLE_EXTENSIONS) 1406 #endif // defined(ENABLE_EXTENSIONS)
1409 1407
1410 InstallChromeJavaScriptNativeDialogFactory(); 1408 InstallChromeJavaScriptNativeDialogFactory();
1411 } 1409 }
1412 1410
1413 void ChromeBrowserMainParts::PostProfileInit() { 1411 void ChromeBrowserMainParts::PostProfileInit() {
1414 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); 1412 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
1415 1413
1416 #if BUILDFLAG(ANDROID_JAVA_UI) 1414 #if BUILDFLAG(ANDROID_JAVA_UI)
1417 DevToolsDiscoveryProviderAndroid::Install(); 1415 DevToolsDiscoveryProviderAndroid::Install();
1418 #else
1419 ChromeDevToolsDiscoveryProvider::Install();
1420 #endif // BUILDFLAG(ANDROID_JAVA_UI) 1416 #endif // BUILDFLAG(ANDROID_JAVA_UI)
1421 1417
1422 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); 1418 LaunchDevToolsHandlerIfNeeded(parsed_command_line());
1423 if (parsed_command_line().HasSwitch(::switches::kAutoOpenDevToolsForTabs)) 1419 if (parsed_command_line().HasSwitch(::switches::kAutoOpenDevToolsForTabs))
1424 g_browser_process->CreateDevToolsAutoOpener(); 1420 g_browser_process->CreateDevToolsAutoOpener();
1425 1421
1426 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1422 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1427 chrome_extra_parts_[i]->PostProfileInit(); 1423 chrome_extra_parts_[i]->PostProfileInit();
1428 } 1424 }
1429 1425
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
2207 chromeos::CrosSettings::Shutdown(); 2203 chromeos::CrosSettings::Shutdown();
2208 #endif // defined(OS_CHROMEOS) 2204 #endif // defined(OS_CHROMEOS)
2209 #endif // defined(OS_ANDROID) 2205 #endif // defined(OS_ANDROID)
2210 } 2206 }
2211 2207
2212 // Public members: 2208 // Public members:
2213 2209
2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2210 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2215 chrome_extra_parts_.push_back(parts); 2211 chrome_extra_parts_.push_back(parts);
2216 } 2212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698