diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 22:31:21 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 22:31:21 +0000 |
commit | 6d227373602b058ec53c56656ac3ccd4ea7549c4 (patch) | |
tree | a93dd916723059a3d63215798c15803ce6a61975 /chrome/browser/cocoa/tab_controller.h | |
parent | f844783017efd73e57900335f353f496857d4ecc (diff) | |
download | chromium_src-6d227373602b058ec53c56656ac3ccd4ea7549c4.zip chromium_src-6d227373602b058ec53c56656ac3ccd4ea7549c4.tar.gz chromium_src-6d227373602b058ec53c56656ac3ccd4ea7549c4.tar.bz2 |
Back out all sorts of stuff back to pre-r18933 so that we can regroup and
figure these perf regressions out.
TEST=graphs
BUG=15232
Review URL: http://codereview.chromium.org/147113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_controller.h')
-rw-r--r-- | chrome/browser/cocoa/tab_controller.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/chrome/browser/cocoa/tab_controller.h b/chrome/browser/cocoa/tab_controller.h index fed9189..7795ec3 100644 --- a/chrome/browser/cocoa/tab_controller.h +++ b/chrome/browser/cocoa/tab_controller.h @@ -7,17 +7,6 @@ #import <Cocoa/Cocoa.h> -// The loading/waiting state of the tab. -// TODO(pinkerton): this really doesn't belong here, but something needs to -// know the state and another parallel array in TabStripController doesn't seem -// like the right place either. In a perfect world, this class shouldn't know -// anything about states that are specific to a browser. -enum TabLoadingState { - DONE, - LOADING, - WAITING, -}; - @class TabView; @protocol TabControllerTarget; @@ -37,12 +26,19 @@ enum TabLoadingState { IBOutlet NSButton *backgroundButton_; IBOutlet NSView* iconView_; BOOL selected_; - TabLoadingState loadingState_; + BOOL loading_; + BOOL waiting_; id<TabControllerTarget> target_; // weak, where actions are sent SEL action_; // selector sent when tab is selected by clicking } -@property(assign, nonatomic) TabLoadingState loadingState; +// The loading/waiting state of the tab. +// TODO(pinkerton): these really don't belong here, but something needs to +// know the state and another parallel array in TabStripController doesn't seem +// like the right place either. In a perfect world, this class shouldn't know +// anything about states that are specific to a browser. +@property(assign, nonatomic) BOOL loading; +@property(assign, nonatomic) BOOL waiting; @property(assign, nonatomic) BOOL selected; @property(assign, nonatomic) id target; |