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 <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 #include "components/variations/variations_http_header_provider.h" | 114 #include "components/variations/variations_http_header_provider.h" |
115 #include "content/public/browser/browser_thread.h" | 115 #include "content/public/browser/browser_thread.h" |
116 #include "content/public/browser/notification_observer.h" | 116 #include "content/public/browser/notification_observer.h" |
117 #include "content/public/browser/notification_registrar.h" | 117 #include "content/public/browser/notification_registrar.h" |
118 #include "content/public/browser/notification_service.h" | 118 #include "content/public/browser/notification_service.h" |
119 #include "content/public/browser/notification_types.h" | 119 #include "content/public/browser/notification_types.h" |
120 #include "content/public/browser/site_instance.h" | 120 #include "content/public/browser/site_instance.h" |
121 #include "content/public/common/content_client.h" | 121 #include "content/public/common/content_client.h" |
122 #include "content/public/common/content_switches.h" | 122 #include "content/public/common/content_switches.h" |
123 #include "content/public/common/main_function_params.h" | 123 #include "content/public/common/main_function_params.h" |
124 #include "grit/app_locale_settings.h" | |
125 #include "grit/platform_locale_settings.h" | 124 #include "grit/platform_locale_settings.h" |
126 #include "net/base/net_module.h" | 125 #include "net/base/net_module.h" |
127 #include "net/base/sdch_manager.h" | 126 #include "net/base/sdch_manager.h" |
128 #include "net/cookies/cookie_monster.h" | 127 #include "net/cookies/cookie_monster.h" |
129 #include "net/http/http_network_layer.h" | 128 #include "net/http/http_network_layer.h" |
130 #include "net/http/http_stream_factory.h" | 129 #include "net/http/http_stream_factory.h" |
131 #include "net/url_request/url_request.h" | 130 #include "net/url_request/url_request.h" |
132 #include "ui/base/l10n/l10n_util.h" | 131 #include "ui/base/l10n/l10n_util.h" |
133 #include "ui/base/layout.h" | 132 #include "ui/base/layout.h" |
134 #include "ui/base/resource/resource_bundle.h" | 133 #include "ui/base/resource/resource_bundle.h" |
| 134 #include "ui/strings/grit/app_locale_settings.h" |
135 | 135 |
136 #if defined(OS_ANDROID) | 136 #if defined(OS_ANDROID) |
137 #include "chrome/browser/metrics/thread_watcher_android.h" | 137 #include "chrome/browser/metrics/thread_watcher_android.h" |
138 #else | 138 #else |
139 #include "chrome/browser/feedback/feedback_profile_observer.h" | 139 #include "chrome/browser/feedback/feedback_profile_observer.h" |
140 #endif | 140 #endif |
141 | 141 |
142 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 142 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
143 #include "chrome/browser/first_run/upgrade_util_linux.h" | 143 #include "chrome/browser/first_run/upgrade_util_linux.h" |
144 #include "chrome/browser/sxs_linux.h" | 144 #include "chrome/browser/sxs_linux.h" |
(...skipping 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1682 chromeos::CrosSettings::Shutdown(); | 1682 chromeos::CrosSettings::Shutdown(); |
1683 #endif | 1683 #endif |
1684 #endif | 1684 #endif |
1685 } | 1685 } |
1686 | 1686 |
1687 // Public members: | 1687 // Public members: |
1688 | 1688 |
1689 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1689 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1690 chrome_extra_parts_.push_back(parts); | 1690 chrome_extra_parts_.push_back(parts); |
1691 } | 1691 } |
OLD | NEW |