| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 103 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 104 #include "chrome/common/chrome_constants.h" | 104 #include "chrome/common/chrome_constants.h" |
| 105 #include "chrome/common/chrome_paths.h" | 105 #include "chrome/common/chrome_paths.h" |
| 106 #include "chrome/common/chrome_result_codes.h" | 106 #include "chrome/common/chrome_result_codes.h" |
| 107 #include "chrome/common/chrome_switches.h" | 107 #include "chrome/common/chrome_switches.h" |
| 108 #include "chrome/common/crash_keys.h" | 108 #include "chrome/common/crash_keys.h" |
| 109 #include "chrome/common/env_vars.h" | 109 #include "chrome/common/env_vars.h" |
| 110 #include "chrome/common/logging_chrome.h" | 110 #include "chrome/common/logging_chrome.h" |
| 111 #include "chrome/common/net/net_resource_provider.h" | 111 #include "chrome/common/net/net_resource_provider.h" |
| 112 #include "chrome/common/pref_names.h" | 112 #include "chrome/common/pref_names.h" |
| 113 #include "chrome/common/profile_management_switches.h" | |
| 114 #include "chrome/common/profiling.h" | 113 #include "chrome/common/profiling.h" |
| 115 #include "chrome/installer/util/google_update_settings.h" | 114 #include "chrome/installer/util/google_update_settings.h" |
| 116 #include "components/language_usage_metrics/language_usage_metrics.h" | 115 #include "components/language_usage_metrics/language_usage_metrics.h" |
| 117 #include "components/nacl/browser/nacl_browser.h" | 116 #include "components/nacl/browser/nacl_browser.h" |
| 118 #include "components/nacl/browser/nacl_process_host.h" | 117 #include "components/nacl/browser/nacl_process_host.h" |
| 119 #include "components/rappor/rappor_service.h" | 118 #include "components/rappor/rappor_service.h" |
| 119 #include "components/signin/core/common/profile_management_switches.h" |
| 120 #include "components/startup_metric_utils/startup_metric_utils.h" | 120 #include "components/startup_metric_utils/startup_metric_utils.h" |
| 121 #include "components/translate/core/browser/translate_download_manager.h" | 121 #include "components/translate/core/browser/translate_download_manager.h" |
| 122 #include "content/public/browser/browser_thread.h" | 122 #include "content/public/browser/browser_thread.h" |
| 123 #include "content/public/browser/notification_observer.h" | 123 #include "content/public/browser/notification_observer.h" |
| 124 #include "content/public/browser/notification_registrar.h" | 124 #include "content/public/browser/notification_registrar.h" |
| 125 #include "content/public/browser/notification_service.h" | 125 #include "content/public/browser/notification_service.h" |
| 126 #include "content/public/browser/notification_types.h" | 126 #include "content/public/browser/notification_types.h" |
| 127 #include "content/public/browser/site_instance.h" | 127 #include "content/public/browser/site_instance.h" |
| 128 #include "content/public/common/content_client.h" | 128 #include "content/public/common/content_client.h" |
| 129 #include "content/public/common/content_switches.h" | 129 #include "content/public/common/content_switches.h" |
| (...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1712 chromeos::CrosSettings::Shutdown(); | 1712 chromeos::CrosSettings::Shutdown(); |
| 1713 #endif | 1713 #endif |
| 1714 #endif | 1714 #endif |
| 1715 } | 1715 } |
| 1716 | 1716 |
| 1717 // Public members: | 1717 // Public members: |
| 1718 | 1718 |
| 1719 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1719 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1720 chrome_extra_parts_.push_back(parts); | 1720 chrome_extra_parts_.push_back(parts); |
| 1721 } | 1721 } |
| OLD | NEW |