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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 #include "chrome/browser/first_run/upgrade_util_win.h" | 202 #include "chrome/browser/first_run/upgrade_util_win.h" |
203 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 203 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
204 #include "chrome/browser/ui/network_profile_bubble.h" | 204 #include "chrome/browser/ui/network_profile_bubble.h" |
205 #include "chrome/installer/util/browser_distribution.h" | 205 #include "chrome/installer/util/browser_distribution.h" |
206 #include "chrome/installer/util/helper.h" | 206 #include "chrome/installer/util/helper.h" |
207 #include "chrome/installer/util/install_util.h" | 207 #include "chrome/installer/util/install_util.h" |
208 #include "chrome/installer/util/module_util_win.h" | 208 #include "chrome/installer/util/module_util_win.h" |
209 #include "chrome/installer/util/shell_util.h" | 209 #include "chrome/installer/util/shell_util.h" |
210 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.
h" | 210 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.
h" |
211 #include "ui/base/l10n/l10n_util_win.h" | 211 #include "ui/base/l10n/l10n_util_win.h" |
212 #include "ui/gfx/win/dpi.h" | |
213 #include "ui/shell_dialogs/select_file_dialog.h" | 212 #include "ui/shell_dialogs/select_file_dialog.h" |
214 #endif // defined(OS_WIN) | 213 #endif // defined(OS_WIN) |
215 | 214 |
216 #if defined(OS_MACOSX) | 215 #if defined(OS_MACOSX) |
217 #include <Security/Security.h> | 216 #include <Security/Security.h> |
218 | 217 |
219 #include "base/mac/scoped_nsautorelease_pool.h" | 218 #include "base/mac/scoped_nsautorelease_pool.h" |
220 #include "chrome/browser/mac/keystone_glue.h" | 219 #include "chrome/browser/mac/keystone_glue.h" |
221 #endif // defined(OS_MACOSX) | 220 #endif // defined(OS_MACOSX) |
222 | 221 |
(...skipping 1725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1948 chromeos::CrosSettings::Shutdown(); | 1947 chromeos::CrosSettings::Shutdown(); |
1949 #endif // defined(OS_CHROMEOS) | 1948 #endif // defined(OS_CHROMEOS) |
1950 #endif // defined(OS_ANDROID) | 1949 #endif // defined(OS_ANDROID) |
1951 } | 1950 } |
1952 | 1951 |
1953 // Public members: | 1952 // Public members: |
1954 | 1953 |
1955 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1954 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1956 chrome_extra_parts_.push_back(parts); | 1955 chrome_extra_parts_.push_back(parts); |
1957 } | 1956 } |
OLD | NEW |