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

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

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 #include "net/base/net_module.h" 143 #include "net/base/net_module.h"
144 #include "net/cookies/cookie_monster.h" 144 #include "net/cookies/cookie_monster.h"
145 #include "net/http/http_network_layer.h" 145 #include "net/http/http_network_layer.h"
146 #include "net/http/http_stream_factory.h" 146 #include "net/http/http_stream_factory.h"
147 #include "net/url_request/url_request.h" 147 #include "net/url_request/url_request.h"
148 #include "ui/base/l10n/l10n_util.h" 148 #include "ui/base/l10n/l10n_util.h"
149 #include "ui/base/layout.h" 149 #include "ui/base/layout.h"
150 #include "ui/base/resource/resource_bundle.h" 150 #include "ui/base/resource/resource_bundle.h"
151 #include "ui/strings/grit/app_locale_settings.h" 151 #include "ui/strings/grit/app_locale_settings.h"
152 152
153 #if defined(ANDROID_JAVA_UI)
154 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
155 #else
156 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"
157 #endif
158
153 #if defined(OS_ANDROID) 159 #if defined(OS_ANDROID)
154 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
155 #include "chrome/browser/metrics/thread_watcher_android.h" 160 #include "chrome/browser/metrics/thread_watcher_android.h"
156 #include "ui/base/resource/resource_bundle_android.h" 161 #include "ui/base/resource/resource_bundle_android.h"
157 #else 162 #else
158 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"
159 #include "chrome/browser/feedback/feedback_profile_observer.h" 163 #include "chrome/browser/feedback/feedback_profile_observer.h"
160 #endif // defined(OS_ANDROID) 164 #endif // defined(OS_ANDROID)
161 165
162 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 166 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
163 #include "chrome/browser/first_run/upgrade_util_linux.h" 167 #include "chrome/browser/first_run/upgrade_util_linux.h"
164 #include "chrome/browser/sxs_linux.h" 168 #include "chrome/browser/sxs_linux.h"
165 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 169 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
166 170
167 #if defined(OS_CHROMEOS) 171 #if defined(OS_CHROMEOS)
168 #include "chrome/browser/chromeos/settings/cros_settings.h" 172 #include "chrome/browser/chromeos/settings/cros_settings.h"
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 #endif // defined(ENABLE_EXTENSIONS) 1128 #endif // defined(ENABLE_EXTENSIONS)
1125 1129
1126 #if !defined(OS_IOS) 1130 #if !defined(OS_IOS)
1127 InstallChromeJavaScriptNativeDialogFactory(); 1131 InstallChromeJavaScriptNativeDialogFactory();
1128 #endif // !defined(OS_IOS) 1132 #endif // !defined(OS_IOS)
1129 } 1133 }
1130 1134
1131 void ChromeBrowserMainParts::PostProfileInit() { 1135 void ChromeBrowserMainParts::PostProfileInit() {
1132 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit"); 1136 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
1133 1137
1134 #if defined(OS_ANDROID) 1138 #if defined(ANDROID_JAVA_UI)
1135 DevToolsDiscoveryProviderAndroid::Install(); 1139 DevToolsDiscoveryProviderAndroid::Install();
1136 #else 1140 #else
1137 ChromeDevToolsDiscoveryProvider::Install(); 1141 ChromeDevToolsDiscoveryProvider::Install();
1138 #endif // defined(OS_ANDROID) 1142 #endif // defined(ANDROID_JAVA_UI)
1139 1143
1140 LaunchDevToolsHandlerIfNeeded(parsed_command_line()); 1144 LaunchDevToolsHandlerIfNeeded(parsed_command_line());
1141 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1145 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1142 chrome_extra_parts_[i]->PostProfileInit(); 1146 chrome_extra_parts_[i]->PostProfileInit();
1143 } 1147 }
1144 1148
1145 void ChromeBrowserMainParts::PreBrowserStart() { 1149 void ChromeBrowserMainParts::PreBrowserStart() {
1146 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart"); 1150 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart");
1147 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1151 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1148 chrome_extra_parts_[i]->PreBrowserStart(); 1152 chrome_extra_parts_[i]->PreBrowserStart();
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1847 chromeos::CrosSettings::Shutdown(); 1851 chromeos::CrosSettings::Shutdown();
1848 #endif // defined(OS_CHROMEOS) 1852 #endif // defined(OS_CHROMEOS)
1849 #endif // defined(OS_ANDROID) 1853 #endif // defined(OS_ANDROID)
1850 } 1854 }
1851 1855
1852 // Public members: 1856 // Public members:
1853 1857
1854 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1858 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1855 chrome_extra_parts_.push_back(parts); 1859 chrome_extra_parts_.push_back(parts);
1856 } 1860 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698