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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 #include "chrome/browser/chrome_select_file_dialog_factory_win.h" | 162 #include "chrome/browser/chrome_select_file_dialog_factory_win.h" |
163 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 163 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
164 #include "chrome/browser/first_run/try_chrome_dialog_view.h" | 164 #include "chrome/browser/first_run/try_chrome_dialog_view.h" |
165 #include "chrome/browser/first_run/upgrade_util_win.h" | 165 #include "chrome/browser/first_run/upgrade_util_win.h" |
166 #include "chrome/browser/ui/network_profile_bubble.h" | 166 #include "chrome/browser/ui/network_profile_bubble.h" |
167 #include "chrome/installer/util/helper.h" | 167 #include "chrome/installer/util/helper.h" |
168 #include "chrome/installer/util/install_util.h" | 168 #include "chrome/installer/util/install_util.h" |
169 #include "chrome/installer/util/shell_util.h" | 169 #include "chrome/installer/util/shell_util.h" |
170 #include "net/base/net_util.h" | 170 #include "net/base/net_util.h" |
171 #include "ui/base/l10n/l10n_util_win.h" | 171 #include "ui/base/l10n/l10n_util_win.h" |
172 #include "ui/gfx/win/dpi.h" | |
173 #include "ui/shell_dialogs/select_file_dialog.h" | 172 #include "ui/shell_dialogs/select_file_dialog.h" |
174 #endif // defined(OS_WIN) | 173 #endif // defined(OS_WIN) |
175 | 174 |
176 #if defined(OS_MACOSX) | 175 #if defined(OS_MACOSX) |
177 #include <Security/Security.h> | 176 #include <Security/Security.h> |
178 | 177 |
179 #include "base/mac/scoped_nsautorelease_pool.h" | 178 #include "base/mac/scoped_nsautorelease_pool.h" |
180 #include "chrome/browser/mac/keystone_glue.h" | 179 #include "chrome/browser/mac/keystone_glue.h" |
181 #endif | 180 #endif |
182 | 181 |
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1676 chromeos::CrosSettings::Shutdown(); | 1675 chromeos::CrosSettings::Shutdown(); |
1677 #endif | 1676 #endif |
1678 #endif | 1677 #endif |
1679 } | 1678 } |
1680 | 1679 |
1681 // Public members: | 1680 // Public members: |
1682 | 1681 |
1683 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1682 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1684 chrome_extra_parts_.push_back(parts); | 1683 chrome_extra_parts_.push_back(parts); |
1685 } | 1684 } |
OLD | NEW |