| 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 15 matching lines...) Expand all Loading... |
| 26 #import "chrome/browser/cocoa/custom_home_pages_model.h" | 26 #import "chrome/browser/cocoa/custom_home_pages_model.h" |
| 27 #import "chrome/browser/cocoa/font_language_settings_controller.h" | 27 #import "chrome/browser/cocoa/font_language_settings_controller.h" |
| 28 #import "chrome/browser/cocoa/import_settings_dialog.h" | 28 #import "chrome/browser/cocoa/import_settings_dialog.h" |
| 29 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" | 29 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" |
| 30 #import "chrome/browser/cocoa/l10n_util.h" | 30 #import "chrome/browser/cocoa/l10n_util.h" |
| 31 #import "chrome/browser/cocoa/search_engine_list_model.h" | 31 #import "chrome/browser/cocoa/search_engine_list_model.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" | |
| 37 #include "chrome/browser/metrics/metrics_service.h" | 36 #include "chrome/browser/metrics/metrics_service.h" |
| 38 #include "chrome/browser/metrics/user_metrics.h" | 37 #include "chrome/browser/metrics/user_metrics.h" |
| 39 #include "chrome/browser/net/predictor_api.h" | 38 #include "chrome/browser/net/predictor_api.h" |
| 40 #include "chrome/browser/net/url_fixer_upper.h" | 39 #include "chrome/browser/net/url_fixer_upper.h" |
| 40 #include "chrome/browser/options_util.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/policy/managed_prefs_banner_base.h" |
| 43 #include "chrome/browser/pref_service.h" | 43 #include "chrome/browser/prefs/pref_service.h" |
| 44 #include "chrome/browser/prefs/session_startup_pref.h" |
| 44 #include "chrome/browser/profile.h" | 45 #include "chrome/browser/profile.h" |
| 45 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 46 #include "chrome/browser/safe_browsing/safe_browsing_service.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" |
| 50 #include "chrome/browser/tab_contents/tab_contents.h" | 50 #include "chrome/browser/tab_contents/tab_contents.h" |
| 51 #include "chrome/common/chrome_switches.h" | 51 #include "chrome/common/chrome_switches.h" |
| 52 #include "chrome/common/notification_details.h" | 52 #include "chrome/common/notification_details.h" |
| 53 #include "chrome/common/notification_observer.h" | 53 #include "chrome/common/notification_observer.h" |
| 54 #include "chrome/common/notification_type.h" | 54 #include "chrome/common/notification_type.h" |
| 55 #include "chrome/common/pref_names.h" | 55 #include "chrome/common/pref_names.h" |
| 56 #include "chrome/common/url_constants.h" | 56 #include "chrome/common/url_constants.h" |
| 57 #include "chrome/installer/util/google_update_settings.h" | 57 #include "chrome/installer/util/google_update_settings.h" |
| 58 #include "grit/chromium_strings.h" | 58 #include "grit/chromium_strings.h" |
| 59 #include "grit/generated_resources.h" | 59 #include "grit/generated_resources.h" |
| 60 #include "grit/locale_settings.h" | 60 #include "grit/locale_settings.h" |
| 61 #include "grit/theme_resources.h" | 61 #include "grit/theme_resources.h" |
| 62 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" |
| 62 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" | 63 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" |
| 63 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" | |
| 64 | 64 |
| 65 namespace { | 65 namespace { |
| 66 | 66 |
| 67 // Colors for the managed preferences warning banner. | 67 // Colors for the managed preferences warning banner. |
| 68 static const double kBannerGradientColorTop[3] = | 68 static const double kBannerGradientColorTop[3] = |
| 69 {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0}; | 69 {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0}; |
| 70 static const double kBannerGradientColorBottom[3] = | 70 static const double kBannerGradientColorBottom[3] = |
| 71 {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0}; | 71 {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0}; |
| 72 static const double kBannerStrokeColor = 135.0 / 255.0; | 72 static const double kBannerStrokeColor = 135.0 / 255.0; |
| 73 | 73 |
| (...skipping 2019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2093 case OPTIONS_PAGE_ADVANCED: | 2093 case OPTIONS_PAGE_ADVANCED: |
| 2094 return underTheHoodView_; | 2094 return underTheHoodView_; |
| 2095 case OPTIONS_PAGE_DEFAULT: | 2095 case OPTIONS_PAGE_DEFAULT: |
| 2096 case OPTIONS_PAGE_COUNT: | 2096 case OPTIONS_PAGE_COUNT: |
| 2097 LOG(DFATAL) << "Invalid page value " << page; | 2097 LOG(DFATAL) << "Invalid page value " << page; |
| 2098 } | 2098 } |
| 2099 return basicsView_; | 2099 return basicsView_; |
| 2100 } | 2100 } |
| 2101 | 2101 |
| 2102 @end | 2102 @end |
| OLD | NEW |