| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/common/pref_member.h" | 9 #include "chrome/common/pref_member.h" |
| 10 | 10 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 Profile* profile_; // weak ref | 31 Profile* profile_; // weak ref |
| 32 PrefService* prefs_; // weak ref - Obtained from profile_ for convenience. | 32 PrefService* prefs_; // weak ref - Obtained from profile_ for convenience. |
| 33 scoped_ptr<PrefObserverBridge> observer_; // Watches for pref changes. | 33 scoped_ptr<PrefObserverBridge> observer_; // Watches for pref changes. |
| 34 | 34 |
| 35 IBOutlet NSToolbar* toolbar_; | 35 IBOutlet NSToolbar* toolbar_; |
| 36 | 36 |
| 37 // The views we'll rotate through | 37 // The views we'll rotate through |
| 38 IBOutlet NSView* basicsView_; | 38 IBOutlet NSView* basicsView_; |
| 39 IBOutlet NSView* personalStuffView_; | 39 IBOutlet NSView* personalStuffView_; |
| 40 IBOutlet NSView* underTheHoodView_; | 40 IBOutlet NSView* underTheHoodView_; |
| 41 // The last page the user was on when they opened the Options window. |
| 42 IntegerPrefMember lastSelectedPage_; |
| 41 | 43 |
| 42 // Having two animations around is bad (they fight), so just use one. | 44 // Having two animations around is bad (they fight), so just use one. |
| 43 scoped_nsobject<NSViewAnimation> animation_; | 45 scoped_nsobject<NSViewAnimation> animation_; |
| 44 | 46 |
| 45 IBOutlet NSArrayController* customPagesArrayController_; | 47 IBOutlet NSArrayController* customPagesArrayController_; |
| 46 | 48 |
| 47 // Basics panel | 49 // Basics panel |
| 48 IntegerPrefMember restoreOnStartup_; | 50 IntegerPrefMember restoreOnStartup_; |
| 49 scoped_nsobject<CustomHomePagesModel> customPagesSource_; | 51 scoped_nsobject<CustomHomePagesModel> customPagesSource_; |
| 50 BooleanPrefMember newTabPageIsHomePage_; | 52 BooleanPrefMember newTabPageIsHomePage_; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 // When a toolbar button is clicked | 105 // When a toolbar button is clicked |
| 104 - (IBAction)toolbarButtonSelected:(id)sender; | 106 - (IBAction)toolbarButtonSelected:(id)sender; |
| 105 | 107 |
| 106 // Usable from cocoa bindings to hook up the custom home pages table. | 108 // Usable from cocoa bindings to hook up the custom home pages table. |
| 107 @property(readonly) CustomHomePagesModel* customPagesSource; | 109 @property(readonly) CustomHomePagesModel* customPagesSource; |
| 108 | 110 |
| 109 // NSNotification sent when the prefs window is closed. | 111 // NSNotification sent when the prefs window is closed. |
| 110 extern NSString* const kUserDoneEditingPrefsNotification; | 112 extern NSString* const kUserDoneEditingPrefsNotification; |
| 111 | 113 |
| 112 @end | 114 @end |
| OLD | NEW |