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