Deprecate Browser::TYPE_PANEL

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

 // Copyright 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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1175 matching lines @@
 
   gfx::Rect client_rect = contents_split_->bounds();
   gfx::Size resize_corner_size = ResizeCorner::GetSize();
   int x = client_rect.width() - resize_corner_size.width();
   if (base::i18n::IsRTL())
     x = 0;
   return gfx::Rect(x, client_rect.height() - resize_corner_size.height(),
                    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();
 #endif  // No tricks are needed to get the right behavior on Linux.
 }
 
 void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url,
                                            Profile* profile) {
   chrome::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL,
                            profile);
@@ skipping 415 matching lines @@
 
 views::View* BrowserView::GetInitiallyFocusedView() {
   // We set the frame not focus on creation so this should never be called.
   NOTREACHED();
   return NULL;
 }
 
 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
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 gfx::ImageSkia BrowserView::GetWindowAppIcon() {
   if (browser_->is_app()) {
     WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
     extensions::TabHelper* extensions_tab_helper =
         contents ? extensions::TabHelper::FromWebContents(contents) : NULL;
     if (extensions_tab_helper && extensions_tab_helper->GetExtensionAppIcon())
       return gfx::ImageSkia::CreateFrom1xBitmap(
           *extensions_tab_helper->GetExtensionAppIcon());
   }
 
   return GetWindowIcon();
 }
 
 gfx::ImageSkia BrowserView::GetWindowIcon() {
   if (browser_->is_app())
     return browser_->GetCurrentPageIcon().AsImageSkia();
   return gfx::ImageSkia();
 }
 
 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
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 bool BrowserView::ExecuteWindowsCommand(int command_id) {
   // This function handles WM_SYSCOMMAND, WM_APPCOMMAND, and WM_COMMAND.
 #if defined(OS_WIN)
   if (command_id == IDC_DEBUG_FRAME_TOGGLE)
@@ skipping 40 matching lines @@
 bool BrowserView::GetSavedWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   if (!ShouldSaveOrRestoreWindowPos())
     return false;
   chrome::GetSavedWindowBoundsAndShowState(browser_.get(), bounds, show_state);
 
 #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
     // |bounds| represents two pieces of information:
     // - the position of the window, in screen coordinates (outer position).
     // - the size of the content area (inner size).
     // We need to use these values to determine the appropriate size and
     // position of the resulting window.
     if (IsToolbarVisible()) {
       // If we're showing the toolbar, we need to adjust |*bounds| to include
@@ skipping 963 matching lines @@
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }