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

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 | « chrome/browser/browser_process.h ('k') | chrome/browser/chrome_webusb_browser_client.cc » ('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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 #include "chrome/browser/process_singleton.h" 81 #include "chrome/browser/process_singleton.h"
82 #include "chrome/browser/profiles/profile.h" 82 #include "chrome/browser/profiles/profile.h"
83 #include "chrome/browser/profiles/profile_manager.h" 83 #include "chrome/browser/profiles/profile_manager.h"
84 #include "chrome/browser/profiles/profiles_state.h" 84 #include "chrome/browser/profiles/profiles_state.h"
85 #include "chrome/browser/shell_integration.h" 85 #include "chrome/browser/shell_integration.h"
86 #include "chrome/browser/tracing/navigation_tracing.h" 86 #include "chrome/browser/tracing/navigation_tracing.h"
87 #include "chrome/browser/translate/translate_service.h" 87 #include "chrome/browser/translate/translate_service.h"
88 #include "chrome/browser/ui/app_list/app_list_service.h" 88 #include "chrome/browser/ui/app_list/app_list_service.h"
89 #include "chrome/browser/ui/browser.h" 89 #include "chrome/browser/ui/browser.h"
90 #include "chrome/browser/ui/browser_finder.h" 90 #include "chrome/browser/ui/browser_finder.h"
91 #include "chrome/browser/ui/host_desktop.h"
92 #include "chrome/browser/ui/startup/bad_flags_prompt.h" 91 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
93 #include "chrome/browser/ui/startup/default_browser_prompt.h" 92 #include "chrome/browser/ui/startup/default_browser_prompt.h"
94 #include "chrome/browser/ui/startup/startup_browser_creator.h" 93 #include "chrome/browser/ui/startup/startup_browser_creator.h"
95 #include "chrome/browser/ui/uma_browsing_activity_observer.h" 94 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
96 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 95 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
97 #include "chrome/common/channel_info.h" 96 #include "chrome/common/channel_info.h"
98 #include "chrome/common/chrome_constants.h" 97 #include "chrome/common/chrome_constants.h"
99 #include "chrome/common/chrome_paths.h" 98 #include "chrome/common/chrome_paths.h"
100 #include "chrome/common/chrome_result_codes.h" 99 #include "chrome/common/chrome_result_codes.h"
101 #include "chrome/common/chrome_switches.h" 100 #include "chrome/common/chrome_switches.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 #include "grit/platform_locale_settings.h" 141 #include "grit/platform_locale_settings.h"
143 #include "media/audio/audio_manager.h" 142 #include "media/audio/audio_manager.h"
144 #include "net/base/net_module.h" 143 #include "net/base/net_module.h"
145 #include "net/cookies/cookie_monster.h" 144 #include "net/cookies/cookie_monster.h"
146 #include "net/http/http_network_layer.h" 145 #include "net/http/http_network_layer.h"
147 #include "net/http/http_stream_factory.h" 146 #include "net/http/http_stream_factory.h"
148 #include "net/url_request/url_request.h" 147 #include "net/url_request/url_request.h"
149 #include "ui/base/l10n/l10n_util.h" 148 #include "ui/base/l10n/l10n_util.h"
150 #include "ui/base/layout.h" 149 #include "ui/base/layout.h"
151 #include "ui/base/resource/resource_bundle.h" 150 #include "ui/base/resource/resource_bundle.h"
151 #include "ui/gfx/host_desktop_type.h"
152 #include "ui/strings/grit/app_locale_settings.h" 152 #include "ui/strings/grit/app_locale_settings.h"
153 153
154 #if defined(OS_ANDROID) 154 #if defined(OS_ANDROID)
155 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" 155 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
156 #include "chrome/browser/metrics/thread_watcher_android.h" 156 #include "chrome/browser/metrics/thread_watcher_android.h"
157 #include "ui/base/resource/resource_bundle_android.h" 157 #include "ui/base/resource/resource_bundle_android.h"
158 #else 158 #else
159 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h" 159 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"
160 #include "chrome/browser/feedback/feedback_profile_observer.h" 160 #include "chrome/browser/feedback/feedback_profile_observer.h"
161 #endif // defined(OS_ANDROID) 161 #endif // defined(OS_ANDROID)
(...skipping 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 chromeos::CrosSettings::Shutdown(); 1846 chromeos::CrosSettings::Shutdown();
1847 #endif // defined(OS_CHROMEOS) 1847 #endif // defined(OS_CHROMEOS)
1848 #endif // defined(OS_ANDROID) 1848 #endif // defined(OS_ANDROID)
1849 } 1849 }
1850 1850
1851 // Public members: 1851 // Public members:
1852 1852
1853 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1853 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1854 chrome_extra_parts_.push_back(parts); 1854 chrome_extra_parts_.push_back(parts);
1855 } 1855 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process.h ('k') | chrome/browser/chrome_webusb_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698