Add BaseWindow::GetContentBounds() and use in WindowController::CreateWindowValue()

chrome/browser/extensions/window_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/window_controller.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 33 matching lines @@
   } else if (window()->IsFullscreen()) {
     window_state = keys::kShowStateValueFullscreen;
   } else if (window()->IsMaximized()) {
     window_state = keys::kShowStateValueMaximized;
   } else {
     window_state = keys::kShowStateValueNormal;
   }
   result->SetString(keys::kShowStateKey, window_state);
 
   gfx::Rect bounds;
-  if (window()->IsMinimized())
-    bounds = window()->GetRestoredBounds();
-  else
-    bounds = window()->GetBounds();
+  bounds = window()->GetContentBounds();
   result->SetInteger(keys::kLeftKey, bounds.x());
   result->SetInteger(keys::kTopKey, bounds.y());
   result->SetInteger(keys::kWidthKey, bounds.width());
   result->SetInteger(keys::kHeightKey, bounds.height());
 
   return result;
 }
 
 }  // namespace extensions