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

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

Issue 1109483003: [DevTools] Migrate chrome to devtools_discovery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtools-discovery-android
Patch Set: rebased Created 5 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/devtools/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #include "net/url_request/url_request.h" 141 #include "net/url_request/url_request.h"
142 #include "ui/base/l10n/l10n_util.h" 142 #include "ui/base/l10n/l10n_util.h"
143 #include "ui/base/layout.h" 143 #include "ui/base/layout.h"
144 #include "ui/base/resource/resource_bundle.h" 144 #include "ui/base/resource/resource_bundle.h"
145 #include "ui/strings/grit/app_locale_settings.h" 145 #include "ui/strings/grit/app_locale_settings.h"
146 146
147 #if defined(OS_ANDROID) 147 #if defined(OS_ANDROID)
148 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" 148 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
149 #include "chrome/browser/metrics/thread_watcher_android.h" 149 #include "chrome/browser/metrics/thread_watcher_android.h"
150 #else 150 #else
151 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"
151 #include "chrome/browser/feedback/feedback_profile_observer.h" 152 #include "chrome/browser/feedback/feedback_profile_observer.h"
152 #endif // defined(OS_ANDROID) 153 #endif // defined(OS_ANDROID)
153 154
154 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 155 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
155 #include "chrome/browser/first_run/upgrade_util_linux.h" 156 #include "chrome/browser/first_run/upgrade_util_linux.h"
156 #include "chrome/browser/sxs_linux.h" 157 #include "chrome/browser/sxs_linux.h"
157 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 158 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
158 159
159 #if defined(OS_CHROMEOS) 160 #if defined(OS_CHROMEOS)
160 #include "chrome/browser/chromeos/settings/cros_settings.h" 161 #include "chrome/browser/chromeos/settings/cros_settings.h"
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 #if !defined(OS_IOS) 1091 #if !defined(OS_IOS)
1091 InstallChromeJavaScriptNativeDialogFactory(); 1092 InstallChromeJavaScriptNativeDialogFactory();
1092 #endif // !defined(OS_IOS) 1093 #endif // !defined(OS_IOS)
1093 } 1094 }
1094 1095
1095 void ChromeBrowserMainParts::PostProfileInit() { 1096 void ChromeBrowserMainParts::PostProfileInit() {
1096 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); 1097 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
1097 1098
1098 #if defined(OS_ANDROID) 1099 #if defined(OS_ANDROID)
1099 DevToolsDiscoveryProviderAndroid::Install(); 1100 DevToolsDiscoveryProviderAndroid::Install();
1101 #else
1102 ChromeDevToolsDiscoveryProvider::Install();
1100 #endif // defined(OS_ANDROID) 1103 #endif // defined(OS_ANDROID)
1101 1104
1102 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); 1105 LaunchDevToolsHandlerIfNeeded(parsed_command_line());
1103 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1106 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1104 chrome_extra_parts_[i]->PostProfileInit(); 1107 chrome_extra_parts_[i]->PostProfileInit();
1105 } 1108 }
1106 1109
1107 void ChromeBrowserMainParts::PreBrowserStart() { 1110 void ChromeBrowserMainParts::PreBrowserStart() {
1108 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); 1111 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart");
1109 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1112 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1772 chromeos::CrosSettings::Shutdown(); 1775 chromeos::CrosSettings::Shutdown();
1773 #endif // defined(OS_CHROMEOS) 1776 #endif // defined(OS_CHROMEOS)
1774 #endif // defined(OS_ANDROID) 1777 #endif // defined(OS_ANDROID)
1775 } 1778 }
1776 1779
1777 // Public members: 1780 // Public members:
1778 1781
1779 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1782 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1780 chrome_extra_parts_.push_back(parts); 1783 chrome_extra_parts_.push_back(parts);
1781 } 1784 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/devtools/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698