| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #import "chrome/browser/ui/cocoa/font_language_settings_controller.h" | 46 #import "chrome/browser/ui/cocoa/font_language_settings_controller.h" |
| 47 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" | 47 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" |
| 48 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h" | 48 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h" |
| 49 #import "chrome/browser/ui/cocoa/l10n_util.h" | 49 #import "chrome/browser/ui/cocoa/l10n_util.h" |
| 50 #import "chrome/browser/ui/cocoa/search_engine_list_model.h" | 50 #import "chrome/browser/ui/cocoa/search_engine_list_model.h" |
| 51 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" | 51 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" |
| 52 #import "chrome/browser/ui/cocoa/window_size_autosaver.h" | 52 #import "chrome/browser/ui/cocoa/window_size_autosaver.h" |
| 53 #include "chrome/browser/ui/options/options_util.h" | 53 #include "chrome/browser/ui/options/options_util.h" |
| 54 #include "chrome/browser/ui/options/options_window.h" | 54 #include "chrome/browser/ui/options/options_window.h" |
| 55 #include "chrome/browser/ui/options/show_options_url.h" | 55 #include "chrome/browser/ui/options/show_options_url.h" |
| 56 #include "chrome/common/chrome_switches.h" | |
| 57 #include "chrome/common/notification_details.h" | 56 #include "chrome/common/notification_details.h" |
| 58 #include "chrome/common/notification_observer.h" | 57 #include "chrome/common/notification_observer.h" |
| 59 #include "chrome/common/notification_type.h" | 58 #include "chrome/common/notification_type.h" |
| 60 #include "chrome/common/pref_names.h" | 59 #include "chrome/common/pref_names.h" |
| 61 #include "chrome/common/url_constants.h" | 60 #include "chrome/common/url_constants.h" |
| 62 #include "chrome/installer/util/google_update_settings.h" | 61 #include "chrome/installer/util/google_update_settings.h" |
| 63 #include "grit/chromium_strings.h" | 62 #include "grit/chromium_strings.h" |
| 64 #include "grit/generated_resources.h" | 63 #include "grit/generated_resources.h" |
| 65 #include "grit/locale_settings.h" | 64 #include "grit/locale_settings.h" |
| 66 #include "grit/theme_resources.h" | 65 #include "grit/theme_resources.h" |
| (...skipping 2096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2163 case OPTIONS_PAGE_ADVANCED: | 2162 case OPTIONS_PAGE_ADVANCED: |
| 2164 return underTheHoodView_; | 2163 return underTheHoodView_; |
| 2165 case OPTIONS_PAGE_DEFAULT: | 2164 case OPTIONS_PAGE_DEFAULT: |
| 2166 case OPTIONS_PAGE_COUNT: | 2165 case OPTIONS_PAGE_COUNT: |
| 2167 LOG(DFATAL) << "Invalid page value " << page; | 2166 LOG(DFATAL) << "Invalid page value " << page; |
| 2168 } | 2167 } |
| 2169 return basicsView_; | 2168 return basicsView_; |
| 2170 } | 2169 } |
| 2171 | 2170 |
| 2172 @end | 2171 @end |
| OLD | NEW |