Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: chrome/browser/ui/cocoa/preferences_window_controller.mm

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 10 matching lines...) Expand all
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/download/download_manager.h" 22 #include "chrome/browser/download/download_manager.h"
23 #include "chrome/browser/download/download_prefs.h" 23 #include "chrome/browser/download/download_prefs.h"
24 #include "chrome/browser/extensions/extensions_service.h" 24 #include "chrome/browser/extensions/extensions_service.h"
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/options_util.h"
32 #include "chrome/browser/options_window.h"
33 #include "chrome/browser/policy/managed_prefs_banner_base.h" 31 #include "chrome/browser/policy/managed_prefs_banner_base.h"
34 #include "chrome/browser/prefs/pref_service.h" 32 #include "chrome/browser/prefs/pref_service.h"
35 #include "chrome/browser/prefs/session_startup_pref.h" 33 #include "chrome/browser/prefs/session_startup_pref.h"
36 #include "chrome/browser/profile.h" 34 #include "chrome/browser/profile.h"
37 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 35 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
38 #include "chrome/browser/shell_integration.h" 36 #include "chrome/browser/shell_integration.h"
39 #include "chrome/browser/show_options_url.h"
40 #include "chrome/browser/sync/profile_sync_service.h" 37 #include "chrome/browser/sync/profile_sync_service.h"
41 #include "chrome/browser/sync/sync_ui_util.h" 38 #include "chrome/browser/sync/sync_ui_util.h"
42 #include "chrome/browser/tab_contents/tab_contents.h" 39 #include "chrome/browser/tab_contents/tab_contents.h"
43 #include "chrome/browser/ui/browser.h" 40 #include "chrome/browser/ui/browser.h"
44 #include "chrome/browser/ui/browser_list.h" 41 #include "chrome/browser/ui/browser_list.h"
45 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" 42 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
46 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h" 43 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h"
47 #import "chrome/browser/ui/cocoa/custom_home_pages_model.h" 44 #import "chrome/browser/ui/cocoa/custom_home_pages_model.h"
48 #import "chrome/browser/ui/cocoa/font_language_settings_controller.h" 45 #import "chrome/browser/ui/cocoa/font_language_settings_controller.h"
49 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" 46 #import "chrome/browser/ui/cocoa/import_settings_dialog.h"
50 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h" 47 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
51 #import "chrome/browser/ui/cocoa/l10n_util.h" 48 #import "chrome/browser/ui/cocoa/l10n_util.h"
52 #import "chrome/browser/ui/cocoa/search_engine_list_model.h" 49 #import "chrome/browser/ui/cocoa/search_engine_list_model.h"
53 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" 50 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"
54 #import "chrome/browser/ui/cocoa/window_size_autosaver.h" 51 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
52 #include "chrome/browser/ui/options/options_util.h"
53 #include "chrome/browser/ui/options/options_window.h"
54 #include "chrome/browser/ui/options/show_options_url.h"
55 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
56 #include "chrome/common/notification_details.h" 56 #include "chrome/common/notification_details.h"
57 #include "chrome/common/notification_observer.h" 57 #include "chrome/common/notification_observer.h"
58 #include "chrome/common/notification_type.h" 58 #include "chrome/common/notification_type.h"
59 #include "chrome/common/pref_names.h" 59 #include "chrome/common/pref_names.h"
60 #include "chrome/common/url_constants.h" 60 #include "chrome/common/url_constants.h"
61 #include "chrome/installer/util/google_update_settings.h" 61 #include "chrome/installer/util/google_update_settings.h"
62 #include "grit/chromium_strings.h" 62 #include "grit/chromium_strings.h"
63 #include "grit/generated_resources.h" 63 #include "grit/generated_resources.h"
64 #include "grit/locale_settings.h" 64 #include "grit/locale_settings.h"
(...skipping 2110 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 case OPTIONS_PAGE_ADVANCED: 2175 case OPTIONS_PAGE_ADVANCED:
2176 return underTheHoodView_; 2176 return underTheHoodView_;
2177 case OPTIONS_PAGE_DEFAULT: 2177 case OPTIONS_PAGE_DEFAULT:
2178 case OPTIONS_PAGE_COUNT: 2178 case OPTIONS_PAGE_COUNT:
2179 LOG(DFATAL) << "Invalid page value " << page; 2179 LOG(DFATAL) << "Invalid page value " << page;
2180 } 2180 }
2181 return basicsView_; 2181 return basicsView_;
2182 } 2182 }
2183 2183
2184 @end 2184 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698