diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 19:47:51 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 19:47:51 +0000 |
| commit | f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a (patch) | |
| tree | 06a498cba9bd9bdc841498f79f2badcb72454b85 /chrome/browser/cocoa/tab_contents_controller.mm | |
| parent | 81e6378c98d0e69339302527eb1de4735d1e2c3f (diff) | |
| download | chromium_src-f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a.zip chromium_src-f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a.tar.gz chromium_src-f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a.tar.bz2 | |
Add "stop" image to project. Clean up project so app/theme is a proper group and its children could be relative to it rather than their grandparent. Plumb loading status into Mac controllers. Add more loading status info to stub TabContents. Make browser window a little taller and wider so NTP didn't show scrollbars.
Review URL: http://codereview.chromium.org/31017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_contents_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/tab_contents_controller.mm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/tab_contents_controller.mm b/chrome/browser/cocoa/tab_contents_controller.mm index bc0677b..0700341 100644 --- a/chrome/browser/cocoa/tab_contents_controller.mm +++ b/chrome/browser/cocoa/tab_contents_controller.mm @@ -160,7 +160,7 @@ class LocationBarBridge : public LocationBar { [backButton_ setEnabled:commands_->IsCommandEnabled(IDC_BACK) ? YES : NO]; [forwardButton_ setEnabled:commands_->IsCommandEnabled(IDC_FORWARD) ? YES : NO]; - [reloadStopButton_ + [reloadButton_ setEnabled:commands_->IsCommandEnabled(IDC_RELOAD) ? YES : NO]; [starButton_ setEnabled:commands_->IsCommandEnabled(IDC_STAR) ? YES : NO]; } @@ -214,7 +214,7 @@ class LocationBarBridge : public LocationBar { // entire bottom corner. localGrowBox.origin.y = 0; // Convert to the content view's coordinates. - localGrowBox = [contentView convertRect:localGrowBox + localGrowBox = [contentView convertRect:localGrowBox fromView:[self view]]; // Flip the rect in view coordinates localGrowBox.origin.y = @@ -224,6 +224,13 @@ class LocationBarBridge : public LocationBar { return localGrowBox; } +- (void)setIsLoading:(BOOL)isLoading { + NSString* imageName = @"go"; + if (isLoading) + imageName = @"stop"; + [goButton_ setImage:[NSImage imageNamed:imageName]]; +} + @end //-------------------------------------------------------------------------- |