Landing Thiago Farina's CL.

See http://codereview.chromium.org/159186

Renaming GetNormalBounds to GetRestoredBounds from browser_window.h.

BUG=None
TEST=None
TBR=tfarina
Review URL: http://codereview.chromium.org/160337

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21983 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index b2f9da8..1de6e48 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -695,7 +695,7 @@ void BrowserView::SetStarredState(bool is_starred) {
   toolbar_->star_button()->SetToggled(is_starred);
 }
 
-gfx::Rect BrowserView::GetNormalBounds() const {
+gfx::Rect BrowserView::GetRestoredBounds() const {
   return frame_->GetWindow()->GetNormalBounds();
 }
 
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index abccd5e..3d0b2b0 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -213,7 +213,7 @@ class BrowserView : public BrowserWindow,
   virtual void FocusDevTools();
   virtual void UpdateLoadingAnimations(bool should_animate);
   virtual void SetStarredState(bool is_starred);
-  virtual gfx::Rect GetNormalBounds() const;
+  virtual gfx::Rect GetRestoredBounds() const;
   virtual bool IsMaximized() const;
   virtual void SetFullscreen(bool fullscreen);
   virtual bool IsFullscreen() const;
diff --git a/chrome/browser/views/panel_controller.cc b/chrome/browser/views/panel_controller.cc
index efcd9d3..d34af21 100644
--- a/chrome/browser/views/panel_controller.cc
+++ b/chrome/browser/views/panel_controller.cc
@@ -71,7 +71,7 @@ PanelController::PanelController(BrowserWindowGtk* browser_window)
        dragging_(false) {
   title_window_ = new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW);
   gfx::Rect title_bounds(
-      0, 0, browser_window->GetNormalBounds().width(), kTitleHeight);
+      0, 0, browser_window->GetRestoredBounds().width(), kTitleHeight);
   title_window_->Init(NULL, title_bounds);
   title_ = title_window_->GetNativeView();
   title_xid_ = x11_util::GetX11WindowFromGtkWidget(title_);
diff --git a/chrome/browser/views/tabs/tab_overview_drag_controller.cc b/chrome/browser/views/tabs/tab_overview_drag_controller.cc
index 1fef35d6..df9b73b 100644
--- a/chrome/browser/views/tabs/tab_overview_drag_controller.cc
+++ b/chrome/browser/views/tabs/tab_overview_drag_controller.cc
@@ -77,7 +77,7 @@ bool TabOverviewDragController::Configure(const gfx::Point& location) {
 
   if (controller_->browser()) {
     browser_window_size_ =
-        controller_->browser()->window()->GetNormalBounds().size();
+        controller_->browser()->window()->GetRestoredBounds().size();
   }
 
   return true;
@@ -115,7 +115,7 @@ void TabOverviewDragController::CommitDrag(const gfx::Point& location) {
     } else {
       DropTab(location);
     }
-  } else if (!dragging_ ) {
+  } else if (!dragging_) {
     // We haven't started dragging. Tell the controller to focus the browser.
     controller_->FocusBrowser();
   } else {
diff --git a/chrome/browser/views/tabs/tab_overview_message_listener.cc b/chrome/browser/views/tabs/tab_overview_message_listener.cc
index d0b6665..e063f5c 100644
--- a/chrome/browser/views/tabs/tab_overview_message_listener.cc
+++ b/chrome/browser/views/tabs/tab_overview_message_listener.cc
@@ -91,7 +91,7 @@ void TabOverviewMessageListener::ProcessMessage(
       } else if (BrowserList::size() > 0) {
         Browser* browser = *BrowserList::begin();
         controller_.reset(new TabOverviewController(
-                              browser->window()->GetNormalBounds().origin()));
+                              browser->window()->GetRestoredBounds().origin()));
         new_browser_window_.reset(
             new NewBrowserWindowWidget(browser->profile()));
       }
@@ -136,7 +136,7 @@ void TabOverviewMessageListener::ShowOverview(Browser* browser,
                                               int horizontal_center) {
   if (!controller_.get()) {
     controller_.reset(new TabOverviewController(
-                          browser->window()->GetNormalBounds().origin()));
+                          browser->window()->GetRestoredBounds().origin()));
   }
   controller_->SetBrowser(browser, horizontal_center);
   controller_->Show();