| 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 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 // other platforms. For now, it's just a stub. This is a serious work in | 198 // other platforms. For now, it's just a stub. This is a serious work in |
| 199 // progress and should not be taken as an indication of a real refactoring. | 199 // progress and should not be taken as an indication of a real refactoring. |
| 200 | 200 |
| 201 #if defined(OS_WIN) | 201 #if defined(OS_WIN) |
| 202 #include "base/trace_event/trace_event_etw_export_win.h" | 202 #include "base/trace_event/trace_event_etw_export_win.h" |
| 203 #include "base/win/registry.h" | 203 #include "base/win/registry.h" |
| 204 #include "base/win/win_util.h" | 204 #include "base/win/win_util.h" |
| 205 #include "chrome/browser/chrome_browser_main_win.h" | 205 #include "chrome/browser/chrome_browser_main_win.h" |
| 206 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 206 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 207 #include "chrome/browser/downgrade/user_data_downgrade.h" | 207 #include "chrome/browser/downgrade/user_data_downgrade.h" |
| 208 #include "chrome/browser/first_run/try_chrome_dialog_view.h" |
| 208 #include "chrome/browser/first_run/upgrade_util_win.h" | 209 #include "chrome/browser/first_run/upgrade_util_win.h" |
| 209 #include "chrome/browser/ui/network_profile_bubble.h" | 210 #include "chrome/browser/ui/network_profile_bubble.h" |
| 210 #include "chrome/browser/ui/views/try_chrome_dialog_view.h" | |
| 211 #include "chrome/browser/win/browser_util.h" | 211 #include "chrome/browser/win/browser_util.h" |
| 212 #include "chrome/browser/win/chrome_select_file_dialog_factory.h" | 212 #include "chrome/browser/win/chrome_select_file_dialog_factory.h" |
| 213 #include "chrome/install_static/install_util.h" | 213 #include "chrome/install_static/install_util.h" |
| 214 #include "ui/base/l10n/l10n_util_win.h" | 214 #include "ui/base/l10n/l10n_util_win.h" |
| 215 #include "ui/shell_dialogs/select_file_dialog.h" | 215 #include "ui/shell_dialogs/select_file_dialog.h" |
| 216 #endif // defined(OS_WIN) | 216 #endif // defined(OS_WIN) |
| 217 | 217 |
| 218 #if defined(OS_MACOSX) | 218 #if defined(OS_MACOSX) |
| 219 #include <Security/Security.h> | 219 #include <Security/Security.h> |
| 220 | 220 |
| (...skipping 1855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2076 chromeos::CrosSettings::Shutdown(); | 2076 chromeos::CrosSettings::Shutdown(); |
| 2077 #endif // defined(OS_CHROMEOS) | 2077 #endif // defined(OS_CHROMEOS) |
| 2078 #endif // defined(OS_ANDROID) | 2078 #endif // defined(OS_ANDROID) |
| 2079 } | 2079 } |
| 2080 | 2080 |
| 2081 // Public members: | 2081 // Public members: |
| 2082 | 2082 |
| 2083 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2083 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2084 chrome_extra_parts_.push_back(parts); | 2084 chrome_extra_parts_.push_back(parts); |
| 2085 } | 2085 } |
| OLD | NEW |