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

7 files changed, 36 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 554619a..9334671 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -114,7 +114,7 @@ void BrowserWindowCocoa::SetFocusToLocationBar() {
 }
 
 void BrowserWindowCocoa::UpdateStopGoState(bool is_loading) {
-  NOTIMPLEMENTED();
+  [controller_ setIsLoading:is_loading ? YES : NO];
 }
 
 void BrowserWindowCocoa::UpdateToolbar(TabContents* contents,
diff --git a/chrome/browser/cocoa/browser_window_controller.h b/chrome/browser/cocoa/browser_window_controller.h
index 0e6b15f..e333758 100644
--- a/chrome/browser/cocoa/browser_window_controller.h
+++ b/chrome/browser/cocoa/browser_window_controller.h
@@ -61,6 +61,9 @@ class TabContents;
 // in the coordinate system of the content area of the currently selected tab.
 - (NSRect)selectedTabGrowBoxRect;
 
+// Called to tell the selected tab to update its loading state.
+- (void)setIsLoading:(BOOL)isLoading;
+
 @end
 
 #endif  // CHROME_BROWSER_BROWSER_WINDOW_CONTROLLER_H_
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index dafb98b..76219e2 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -154,4 +154,8 @@
               selectedTabGrowBoxRect];
 }
 
+- (void)setIsLoading:(BOOL)isLoading {
+  [tabStripController_ setIsLoading:isLoading];
+}
+
 @end
diff --git a/chrome/browser/cocoa/tab_contents_controller.h b/chrome/browser/cocoa/tab_contents_controller.h
index 86f6b0c..de58708 100644
--- a/chrome/browser/cocoa/tab_contents_controller.h
+++ b/chrome/browser/cocoa/tab_contents_controller.h
@@ -35,8 +35,9 @@ class ToolbarModel;
   ToolbarModel* toolbarModel_;  // weak, one per window
   IBOutlet NSButton* backButton_;
   IBOutlet NSButton* forwardButton_;
-  IBOutlet NSButton* reloadStopButton_;
+  IBOutlet NSButton* reloadButton_;
   IBOutlet NSButton* starButton_;
+  IBOutlet NSButton* goButton_;
   IBOutlet NSTextField* locationBar_;
   IBOutlet NSBox* contentsBox_;
   IBOutlet GrowBoxView* growBox_;
@@ -78,6 +79,10 @@ class ToolbarModel;
 // in the coordinate system of the content area of this tab.
 - (NSRect)growBoxRect;
 
+// Called to update the loading state. Handles updating the go/stop button
+// state.
+- (void)setIsLoading:(BOOL)isLoading;
+
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TAB_COTNENTS_CONTROLLER_H_
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
 
 //--------------------------------------------------------------------------
diff --git a/chrome/browser/cocoa/tab_strip_controller.h b/chrome/browser/cocoa/tab_strip_controller.h
index 160566a..968b9ec 100644
--- a/chrome/browser/cocoa/tab_strip_controller.h
+++ b/chrome/browser/cocoa/tab_strip_controller.h
@@ -66,6 +66,9 @@ class ToolbarModel;
 // in the coordinate system of the content area of the currently selected tab.
 - (NSRect)selectedTabGrowBoxRect;
 
+// Called to tell the selected tab to update its loading state.
+- (void)setIsLoading:(BOOL)isLoading;
+
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TAB_STRIP_CONTROLLER_H_
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 7dccb26..98abf86 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -343,6 +343,16 @@ class TabStripBridge : public TabStripModelObserver {
   return [selectedController growBoxRect];
 }
 
+// Called to tell the selected tab to update its loading state.
+- (void)setIsLoading:(BOOL)isLoading {
+  // TODO(pinkerton): update the favicon on the selected tab view to/from
+  // a spinner?
+
+  TabContentsController* selectedController =
+      [tabControllerArray_ objectAtIndex:tabModel_->selected_index()];
+  [selectedController setIsLoading:isLoading];
+}
+
 @end
 
 //--------------------------------------------------------------------------