| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 #include "chrome/browser/component_updater/caps_installer_win.h" | 191 #include "chrome/browser/component_updater/caps_installer_win.h" |
| 192 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 192 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 193 #include "chrome/browser/first_run/try_chrome_dialog_view.h" | 193 #include "chrome/browser/first_run/try_chrome_dialog_view.h" |
| 194 #include "chrome/browser/first_run/upgrade_util_win.h" | 194 #include "chrome/browser/first_run/upgrade_util_win.h" |
| 195 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 195 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 196 #include "chrome/browser/ui/network_profile_bubble.h" | 196 #include "chrome/browser/ui/network_profile_bubble.h" |
| 197 #include "chrome/installer/util/browser_distribution.h" | 197 #include "chrome/installer/util/browser_distribution.h" |
| 198 #include "chrome/installer/util/helper.h" | 198 #include "chrome/installer/util/helper.h" |
| 199 #include "chrome/installer/util/install_util.h" | 199 #include "chrome/installer/util/install_util.h" |
| 200 #include "chrome/installer/util/shell_util.h" | 200 #include "chrome/installer/util/shell_util.h" |
| 201 #include "components/startup_metric_utils/browser/pre_read_field_trial_utils_win
.h" | 201 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.
h" |
| 202 #include "net/base/net_util.h" | 202 #include "net/base/net_util.h" |
| 203 #include "ui/base/l10n/l10n_util_win.h" | 203 #include "ui/base/l10n/l10n_util_win.h" |
| 204 #include "ui/gfx/win/dpi.h" | 204 #include "ui/gfx/win/dpi.h" |
| 205 #include "ui/shell_dialogs/select_file_dialog.h" | 205 #include "ui/shell_dialogs/select_file_dialog.h" |
| 206 #endif // defined(OS_WIN) | 206 #endif // defined(OS_WIN) |
| 207 | 207 |
| 208 #if defined(OS_MACOSX) | 208 #if defined(OS_MACOSX) |
| 209 #include <Security/Security.h> | 209 #include <Security/Security.h> |
| 210 | 210 |
| 211 #include "base/mac/scoped_nsautorelease_pool.h" | 211 #include "base/mac/scoped_nsautorelease_pool.h" |
| (...skipping 1660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1872 chromeos::CrosSettings::Shutdown(); | 1872 chromeos::CrosSettings::Shutdown(); |
| 1873 #endif // defined(OS_CHROMEOS) | 1873 #endif // defined(OS_CHROMEOS) |
| 1874 #endif // defined(OS_ANDROID) | 1874 #endif // defined(OS_ANDROID) |
| 1875 } | 1875 } |
| 1876 | 1876 |
| 1877 // Public members: | 1877 // Public members: |
| 1878 | 1878 |
| 1879 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1879 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1880 chrome_extra_parts_.push_back(parts); | 1880 chrome_extra_parts_.push_back(parts); |
| 1881 } | 1881 } |
| OLD | NEW |