| 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 #endif // defined(OS_WIN) | 177 #endif // defined(OS_WIN) |
| 178 | 178 |
| 179 #if defined(OS_MACOSX) | 179 #if defined(OS_MACOSX) |
| 180 #include <Security/Security.h> | 180 #include <Security/Security.h> |
| 181 | 181 |
| 182 #include "base/mac/scoped_nsautorelease_pool.h" | 182 #include "base/mac/scoped_nsautorelease_pool.h" |
| 183 #include "chrome/browser/mac/keystone_glue.h" | 183 #include "chrome/browser/mac/keystone_glue.h" |
| 184 #endif | 184 #endif |
| 185 | 185 |
| 186 #if !defined(OS_IOS) | 186 #if !defined(OS_IOS) |
| 187 #include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_fa
ctory.h" | 187 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" |
| 188 #endif | 188 #endif |
| 189 | 189 |
| 190 #if !defined(DISABLE_NACL) | 190 #if !defined(DISABLE_NACL) |
| 191 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 191 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 192 #include "components/nacl/browser/nacl_process_host.h" | 192 #include "components/nacl/browser/nacl_process_host.h" |
| 193 #endif | 193 #endif |
| 194 | 194 |
| 195 #if defined(ENABLE_EXTENSIONS) | 195 #if defined(ENABLE_EXTENSIONS) |
| 196 #include "chrome/browser/extensions/startup_helper.h" | 196 #include "chrome/browser/extensions/startup_helper.h" |
| 197 #include "extensions/browser/extension_protocols.h" | 197 #include "extensions/browser/extension_protocols.h" |
| (...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1716 chromeos::CrosSettings::Shutdown(); | 1716 chromeos::CrosSettings::Shutdown(); |
| 1717 #endif | 1717 #endif |
| 1718 #endif | 1718 #endif |
| 1719 } | 1719 } |
| 1720 | 1720 |
| 1721 // Public members: | 1721 // Public members: |
| 1722 | 1722 |
| 1723 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1723 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1724 chrome_extra_parts_.push_back(parts); | 1724 chrome_extra_parts_.push_back(parts); |
| 1725 } | 1725 } |
| OLD | NEW |