| 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/ui/cocoa/preferences_window_controller.h" | 5 #import "chrome/browser/ui/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 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/browser/google/google_util.h" | 25 #include "chrome/browser/google/google_util.h" |
| 26 #include "chrome/browser/instant/instant_confirm_dialog.h" | 26 #include "chrome/browser/instant/instant_confirm_dialog.h" |
| 27 #include "chrome/browser/instant/instant_controller.h" | 27 #include "chrome/browser/instant/instant_controller.h" |
| 28 #include "chrome/browser/metrics/metrics_service.h" | 28 #include "chrome/browser/metrics/metrics_service.h" |
| 29 #include "chrome/browser/metrics/user_metrics.h" | 29 #include "chrome/browser/metrics/user_metrics.h" |
| 30 #include "chrome/browser/net/url_fixer_upper.h" | 30 #include "chrome/browser/net/url_fixer_upper.h" |
| 31 #include "chrome/browser/policy/managed_prefs_banner_base.h" | 31 #include "chrome/browser/policy/managed_prefs_banner_base.h" |
| 32 #include "chrome/browser/prefs/pref_service.h" | 32 #include "chrome/browser/prefs/pref_service.h" |
| 33 #include "chrome/browser/prefs/session_startup_pref.h" | 33 #include "chrome/browser/prefs/session_startup_pref.h" |
| 34 #include "chrome/browser/profiles/profile.h" | 34 #include "chrome/browser/profiles/profile.h" |
| 35 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
| 35 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 36 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 36 #include "chrome/browser/shell_integration.h" | 37 #include "chrome/browser/shell_integration.h" |
| 37 #include "chrome/browser/sync/profile_sync_service.h" | 38 #include "chrome/browser/sync/profile_sync_service.h" |
| 38 #include "chrome/browser/sync/sync_ui_util.h" | 39 #include "chrome/browser/sync/sync_ui_util.h" |
| 39 #include "chrome/browser/tab_contents/tab_contents.h" | 40 #include "chrome/browser/tab_contents/tab_contents.h" |
| 40 #include "chrome/browser/ui/browser.h" | 41 #include "chrome/browser/ui/browser.h" |
| 41 #include "chrome/browser/ui/browser_list.h" | 42 #include "chrome/browser/ui/browser_list.h" |
| 42 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" | 43 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" |
| 43 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h" | 44 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h" |
| 44 #import "chrome/browser/ui/cocoa/custom_home_pages_model.h" | 45 #import "chrome/browser/ui/cocoa/custom_home_pages_model.h" |
| (...skipping 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2161 case OPTIONS_PAGE_ADVANCED: | 2162 case OPTIONS_PAGE_ADVANCED: |
| 2162 return underTheHoodView_; | 2163 return underTheHoodView_; |
| 2163 case OPTIONS_PAGE_DEFAULT: | 2164 case OPTIONS_PAGE_DEFAULT: |
| 2164 case OPTIONS_PAGE_COUNT: | 2165 case OPTIONS_PAGE_COUNT: |
| 2165 LOG(DFATAL) << "Invalid page value " << page; | 2166 LOG(DFATAL) << "Invalid page value " << page; |
| 2166 } | 2167 } |
| 2167 return basicsView_; | 2168 return basicsView_; |
| 2168 } | 2169 } |
| 2169 | 2170 |
| 2170 @end | 2171 @end |
| OLD | NEW |