summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 13:13:38 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 13:13:38 +0000
commit936c937ac987d88f2898132a924ef45d329c8af2 (patch)
treeed42330a4cbb5c75351da67a6998f2f0be6341c2 /chrome/browser/cocoa
parente9609bd1963653a95daf38187b2cee6c0c33019a (diff)
downloadchromium_src-936c937ac987d88f2898132a924ef45d329c8af2.zip
chromium_src-936c937ac987d88f2898132a924ef45d329c8af2.tar.gz
chromium_src-936c937ac987d88f2898132a924ef45d329c8af2.tar.bz2
Backing out last change to see if it regressed perf.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/tab_strip_controller.mm16
1 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 128ad7e..90fced55 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -450,16 +450,12 @@ NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
TabController* tabController = [tabArray_ objectAtIndex:index];
NSImage* image = nil;
- if (contents->waiting_for_response()) {
- if (![tabController waiting]) {
- image = throbberWaitingImage;
- [tabController setWaiting:YES];
- }
- } else if (contents->is_loading()) {
- if (![tabController loading]) {
- image = throbberImage;
- [tabController setLoading:YES];
- }
+ if (contents->waiting_for_response() && ![tabController waiting]) {
+ image = throbberWaitingImage;
+ [tabController setWaiting:YES];
+ } else if (contents->is_loading() && ![tabController loading]) {
+ image = throbberImage;
+ [tabController setLoading:YES];
}
if (image) {
NSRect frame = NSMakeRect(0, 0, 16, 16);