| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "chrome/browser/cocoa/preferences_window_controller.h" | 5 #import "chrome/browser/cocoa/preferences_window_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/l10n_util_mac.h" | 10 #include "app/l10n_util_mac.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #import "chrome/browser/cocoa/l10n_util.h" | 29 #import "chrome/browser/cocoa/l10n_util.h" |
| 30 #import "chrome/browser/cocoa/search_engine_list_model.h" | 30 #import "chrome/browser/cocoa/search_engine_list_model.h" |
| 31 #import "chrome/browser/cocoa/sync_customize_controller_cppsafe.h" | 31 #import "chrome/browser/cocoa/sync_customize_controller_cppsafe.h" |
| 32 #import "chrome/browser/cocoa/vertical_gradient_view.h" | 32 #import "chrome/browser/cocoa/vertical_gradient_view.h" |
| 33 #import "chrome/browser/cocoa/window_size_autosaver.h" | 33 #import "chrome/browser/cocoa/window_size_autosaver.h" |
| 34 #include "chrome/browser/download/download_manager.h" | 34 #include "chrome/browser/download/download_manager.h" |
| 35 #include "chrome/browser/extensions/extensions_service.h" | 35 #include "chrome/browser/extensions/extensions_service.h" |
| 36 #include "chrome/browser/managed_prefs_banner_base.h" | 36 #include "chrome/browser/managed_prefs_banner_base.h" |
| 37 #include "chrome/browser/metrics/metrics_service.h" | 37 #include "chrome/browser/metrics/metrics_service.h" |
| 38 #include "chrome/browser/metrics/user_metrics.h" | 38 #include "chrome/browser/metrics/user_metrics.h" |
| 39 #include "chrome/browser/net/dns_global.h" | 39 #include "chrome/browser/net/predictor_api.h" |
| 40 #include "chrome/browser/net/url_fixer_upper.h" | 40 #include "chrome/browser/net/url_fixer_upper.h" |
| 41 #include "chrome/browser/options_window.h" | 41 #include "chrome/browser/options_window.h" |
| 42 #include "chrome/browser/options_util.h" | 42 #include "chrome/browser/options_util.h" |
| 43 #include "chrome/browser/pref_service.h" | 43 #include "chrome/browser/pref_service.h" |
| 44 #include "chrome/browser/profile.h" | 44 #include "chrome/browser/profile.h" |
| 45 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 45 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 46 #include "chrome/browser/session_startup_pref.h" | 46 #include "chrome/browser/session_startup_pref.h" |
| 47 #include "chrome/browser/shell_integration.h" | 47 #include "chrome/browser/shell_integration.h" |
| 48 #include "chrome/browser/sync/profile_sync_service.h" | 48 #include "chrome/browser/sync/profile_sync_service.h" |
| 49 #include "chrome/browser/sync/sync_ui_util.h" | 49 #include "chrome/browser/sync/sync_ui_util.h" |
| (...skipping 2038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2088 case OPTIONS_PAGE_ADVANCED: | 2088 case OPTIONS_PAGE_ADVANCED: |
| 2089 return underTheHoodView_; | 2089 return underTheHoodView_; |
| 2090 case OPTIONS_PAGE_DEFAULT: | 2090 case OPTIONS_PAGE_DEFAULT: |
| 2091 case OPTIONS_PAGE_COUNT: | 2091 case OPTIONS_PAGE_COUNT: |
| 2092 LOG(DFATAL) << "Invalid page value " << page; | 2092 LOG(DFATAL) << "Invalid page value " << page; |
| 2093 } | 2093 } |
| 2094 return basicsView_; | 2094 return basicsView_; |
| 2095 } | 2095 } |
| 2096 | 2096 |
| 2097 @end | 2097 @end |
| OLD | NEW |