| 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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 #include "chrome/browser/first_run/try_chrome_dialog_view.h" | 168 #include "chrome/browser/first_run/try_chrome_dialog_view.h" |
| 169 #include "chrome/browser/first_run/upgrade_util_win.h" | 169 #include "chrome/browser/first_run/upgrade_util_win.h" |
| 170 #include "chrome/browser/ui/network_profile_bubble.h" | 170 #include "chrome/browser/ui/network_profile_bubble.h" |
| 171 #include "chrome/common/net/url_fixer_upper.h" | 171 #include "chrome/common/net/url_fixer_upper.h" |
| 172 #include "chrome/installer/util/helper.h" | 172 #include "chrome/installer/util/helper.h" |
| 173 #include "chrome/installer/util/install_util.h" | 173 #include "chrome/installer/util/install_util.h" |
| 174 #include "chrome/installer/util/shell_util.h" | 174 #include "chrome/installer/util/shell_util.h" |
| 175 #include "net/base/net_util.h" | 175 #include "net/base/net_util.h" |
| 176 #include "printing/printed_document.h" | 176 #include "printing/printed_document.h" |
| 177 #include "ui/base/l10n/l10n_util_win.h" | 177 #include "ui/base/l10n/l10n_util_win.h" |
| 178 #include "ui/gfx/dpi_win.h" | 178 #include "ui/gfx/win/dpi.h" |
| 179 #endif // defined(OS_WIN) | 179 #endif // defined(OS_WIN) |
| 180 | 180 |
| 181 #if defined(OS_MACOSX) | 181 #if defined(OS_MACOSX) |
| 182 #include <Security/Security.h> | 182 #include <Security/Security.h> |
| 183 | 183 |
| 184 #include "base/mac/scoped_nsautorelease_pool.h" | 184 #include "base/mac/scoped_nsautorelease_pool.h" |
| 185 #include "chrome/browser/mac/keystone_glue.h" | 185 #include "chrome/browser/mac/keystone_glue.h" |
| 186 #endif | 186 #endif |
| 187 | 187 |
| 188 #if defined(ENABLE_RLZ) | 188 #if defined(ENABLE_RLZ) |
| (...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1694 chromeos::CrosSettings::Shutdown(); | 1694 chromeos::CrosSettings::Shutdown(); |
| 1695 #endif | 1695 #endif |
| 1696 #endif | 1696 #endif |
| 1697 } | 1697 } |
| 1698 | 1698 |
| 1699 // Public members: | 1699 // Public members: |
| 1700 | 1700 |
| 1701 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1701 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1702 chrome_extra_parts_.push_back(parts); | 1702 chrome_extra_parts_.push_back(parts); |
| 1703 } | 1703 } |
| OLD | NEW |