Deprecate Browser::TYPE_PANEL

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index a0f7184eeda3ce53d9769d17560019ccd0891295..c3f6db621af973a33139bdfcfb646d05bb2f555b 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1193,10 +1193,6 @@ gfx::Rect BrowserView::GetRootWindowResizerRect() const {
                    resize_corner_size.width(), resize_corner_size.height());
 }
 
-bool BrowserView::IsPanel() const {
-  return false;
-}
-
 void BrowserView::DisableInactiveFrame() {
 #if defined(OS_WIN) && !defined(USE_AURA)
   frame_->DisableInactiveRendering();
@@ -1632,7 +1628,7 @@ views::View* BrowserView::GetInitiallyFocusedView() {
 bool BrowserView::ShouldShowWindowTitle() const {
 #if defined(USE_ASH)
   // For Ash only, app host windows do not show an icon, crbug.com/119411.
-  // Child windows (e.g. extension panels, popups) do show an icon.
+  // Child windows (i.e. popups) do show an icon.
   if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST)
     return false;
 #endif
@@ -1661,7 +1657,7 @@ gfx::ImageSkia BrowserView::GetWindowIcon() {
 bool BrowserView::ShouldShowWindowIcon() const {
 #if defined(USE_ASH)
   // For Ash only, app host windows do not show an icon, crbug.com/119411.
-  // Child windows (e.g. extension panels, popups) do show an icon.
+  // Child windows (i.e. popups) do show an icon.
   if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST)
     return false;
 #endif
@@ -1722,22 +1718,23 @@ bool BrowserView::GetSavedWindowPlacement(
 #if defined(USE_ASH)
   if (chrome::IsNativeWindowInAsh(
           const_cast<BrowserView*>(this)->GetNativeWindow())) {
-  if (browser_->is_type_popup() || browser_->is_type_panel()) {
-      // In case of a popup or panel with an 'unspecified' location we are
+    if (browser_->is_type_popup()) {
+      // In case of a popup with an 'unspecified' location we are
       // looking for a good screen location. We are interpreting (0,0) as an
       // unspecified location.
-    if (bounds->x() == 0 && bounds->y() == 0) {
-      *bounds = ChromeShellDelegate::instance()->window_positioner()->
-          GetPopupPosition(*bounds);
+      if (bounds->x() == 0 && bounds->y() == 0) {
+        *bounds = ChromeShellDelegate::instance()->window_positioner()->
+            GetPopupPosition(*bounds);
+      }
     }
   }
-  }
 #endif
 
-  if ((browser_->is_type_popup() || browser_->is_type_panel()) &&
+  if (browser_->is_type_popup() &&
       bounds->width() == browser_->override_bounds().width() &&
       bounds->height() == browser_->override_bounds().height() &&
-      !(browser_->is_app() && browser_->is_session_restore()) &&
+      !browser_->is_session_restore() &&
+      !browser_->is_app() &&
       !browser_->is_devtools()) {
     // This is neither a popup window that has not been resized nor it is not an
     // application window in the session restore phase. The value passed in