chrome/browser/cocoa/preferences_window_controller.h - Issue 2828005: Unify the page and wrench menus into one wrench menu. Remove pref to hide men...

Side by Side Diff: chrome/browser/cocoa/preferences_window_controller.h

Issue 2828005: Unify the page and wrench menus into one wrench menu. Remove pref to hide men... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 6 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

« no previous file with comments | « chrome/app/nibs/Toolbar.xib ('k') | chrome/browser/cocoa/preferences_window_controller.mm » ('j') | no next file with comments »

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 <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

7 #include "base/scoped_ptr.h"	7 #include "base/scoped_ptr.h"

8 #include "base/scoped_nsobject.h"	8 #include "base/scoped_nsobject.h"

9 #include "chrome/browser/options_window.h"	9 #include "chrome/browser/options_window.h"

10 #include "chrome/browser/pref_member.h"	10 #include "chrome/browser/pref_member.h"

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 scoped_nsobject<NSViewAnimation> animation_;	71 scoped_nsobject<NSViewAnimation> animation_;

72	72

73 IBOutlet NSArrayController* customPagesArrayController_;	73 IBOutlet NSArrayController* customPagesArrayController_;

74	74

75 // Basics panel	75 // Basics panel

76 IntegerPrefMember restoreOnStartup_;	76 IntegerPrefMember restoreOnStartup_;

77 scoped_nsobject<CustomHomePagesModel> customPagesSource_;	77 scoped_nsobject<CustomHomePagesModel> customPagesSource_;

78 BooleanPrefMember newTabPageIsHomePage_;	78 BooleanPrefMember newTabPageIsHomePage_;

79 StringPrefMember homepage_;	79 StringPrefMember homepage_;

80 BooleanPrefMember showHomeButton_;	80 BooleanPrefMember showHomeButton_;

81 BooleanPrefMember showPageOptionButtons_;

82 scoped_nsobject<SearchEngineListModel> searchEngineModel_;	81 scoped_nsobject<SearchEngineListModel> searchEngineModel_;

83 // Used when creating a new home page url to make the new cell editable.	82 // Used when creating a new home page url to make the new cell editable.

84 BOOL pendingSelectForEdit_;	83 BOOL pendingSelectForEdit_;

85	84

86 // User Data panel	85 // User Data panel

87 BooleanPrefMember askSavePasswords_;	86 BooleanPrefMember askSavePasswords_;

88 BooleanPrefMember formAutofill_;	87 BooleanPrefMember formAutofill_;

89 IBOutlet NSButton* autoFillSettingsButton_;	88 IBOutlet NSButton* autoFillSettingsButton_;

90 IBOutlet NSButton* syncButton_;	89 IBOutlet NSButton* syncButton_;

91 IBOutlet NSButton* syncCustomizeButton_;	90 IBOutlet NSButton* syncCustomizeButton_;

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 // Returns the (normalized) page corresponding to the given toolbar item.	183 // Returns the (normalized) page corresponding to the given toolbar item.

185 // Should be called only after awakeFromNib is.	184 // Should be called only after awakeFromNib is.

186 - (OptionsPage)getPageForToolbarItem:(NSToolbarItem*)toolbarItem;	185 - (OptionsPage)getPageForToolbarItem:(NSToolbarItem*)toolbarItem;

187	186

188 // Returns the view corresponding to the given page. Should be called	187 // Returns the view corresponding to the given page. Should be called

189 // only after awakeFromNib is.	188 // only after awakeFromNib is.

190 - (NSView*)getPrefsViewForPage:(OptionsPage)page;	189 - (NSView*)getPrefsViewForPage:(OptionsPage)page;

191	190

192 @end	191 @end

193	192

OLD	NEW