chrome/browser/ui/cocoa/options/preferences_window_controller.mm - Issue 6339002: [Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/coc...

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

Issue 6339002: [Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/coc... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 months 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

« chrome/browser/ui/cocoa/options/cookies_window_controller_unittest.mm ('K') | « chrome/browser/ui/cocoa/options/preferences_window_controller.h ('k') | chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/options/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"

11 #include "app/resource_bundle.h"	11 #include "app/resource_bundle.h"

12 #include "base/logging.h"	12 #include "base/logging.h"

13 #include "base/mac/mac_util.h"	13 #include "base/mac/mac_util.h"

14 #include "base/mac/scoped_aedesc.h"	14 #include "base/mac/scoped_aedesc.h"

15 #include "base/string16.h"	15 #include "base/string16.h"

(...skipping 18 matching lines...) Expand all Loading...
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/renderer_host/resource_dispatcher_host.h"

36 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	36 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

37 #include "chrome/browser/shell_integration.h"	37 #include "chrome/browser/shell_integration.h"

38 #include "chrome/browser/sync/profile_sync_service.h"	38 #include "chrome/browser/sync/profile_sync_service.h"

39 #include "chrome/browser/sync/sync_ui_util.h"	39 #include "chrome/browser/sync/sync_ui_util.h"

40 #include "chrome/browser/tab_contents/tab_contents.h"	40 #include "chrome/browser/tab_contents/tab_contents.h"

41 #include "chrome/browser/ui/browser.h"	41 #include "chrome/browser/ui/browser.h"

42 #include "chrome/browser/ui/browser_list.h"	42 #include "chrome/browser/ui/browser_list.h"

43 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"	43 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"

44 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h"

45 #import "chrome/browser/ui/cocoa/custom_home_pages_model.h"

46 #import "chrome/browser/ui/cocoa/font_language_settings_controller.h"

47 #import "chrome/browser/ui/cocoa/import_settings_dialog.h"	44 #import "chrome/browser/ui/cocoa/import_settings_dialog.h"

48 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"

49 #import "chrome/browser/ui/cocoa/l10n_util.h"	45 #import "chrome/browser/ui/cocoa/l10n_util.h"

50 #import "chrome/browser/ui/cocoa/search_engine_list_model.h"	46 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"

	47 #import "chrome/browser/ui/cocoa/options/custom_home_pages_model.h"

	48 #import "chrome/browser/ui/cocoa/options/font_language_settings_controller.h"

	49 #import "chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h"

	50 #import "chrome/browser/ui/cocoa/options/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/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"

(...skipping 2101 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2162 case OPTIONS_PAGE_ADVANCED:	2162 case OPTIONS_PAGE_ADVANCED:

2163 return underTheHoodView_;	2163 return underTheHoodView_;

2164 case OPTIONS_PAGE_DEFAULT:	2164 case OPTIONS_PAGE_DEFAULT:

2165 case OPTIONS_PAGE_COUNT:	2165 case OPTIONS_PAGE_COUNT:

2166 LOG(DFATAL) << "Invalid page value " << page;	2166 LOG(DFATAL) << "Invalid page value " << page;

2167 }	2167 }

2168 return basicsView_;	2168 return basicsView_;

2169 }	2169 }

2170	2170

2171 @end	2171 @end

OLD	NEW