Deprecate Browser::TYPE_PANEL

chrome/browser/devtools/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
@@ skipping 299 matching lines @@
     delete this;
     browser->tab_strip_model()->CloseAllTabs();
   }
 }
 
 void DevToolsWindow::Show(DevToolsToggleAction action) {
   if (IsDocked()) {
     Browser* inspected_browser;
     int inspected_tab_index;
     // Tell inspected browser to update splitter and switch to inspected panel.
-    if (!IsInspectedBrowserPopupOrPanel() &&
+    if (!IsInspectedBrowserPopup() &&
         FindInspectedBrowserAndTabIndex(&inspected_browser,
                                         &inspected_tab_index)) {
       BrowserWindow* inspected_window = inspected_browser->window();
       web_contents_->SetDelegate(this);
       inspected_window->UpdateDevTools();
       web_contents_->GetView()->SetInitialFocus();
       inspected_window->Show();
       TabStripModel* tab_strip_model = inspected_browser->tab_strip_model();
       tab_strip_model->ActivateTabAt(inspected_tab_index, true);
       ScheduleAction(action);
@@ skipping 131 matching lines @@
   return false;
 }
 
 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() {
   Browser* browser = NULL;
   int tab;
   return FindInspectedBrowserAndTabIndex(&browser, &tab) ?
       browser->window() : NULL;
 }
 
-bool DevToolsWindow::IsInspectedBrowserPopupOrPanel() {
+bool DevToolsWindow::IsInspectedBrowserPopup() {
   Browser* browser = NULL;
   int tab;
   if (!FindInspectedBrowserAndTabIndex(&browser, &tab))
     return false;
 
-  return browser->is_type_popup() || browser->is_type_panel();
+  return browser->is_type_popup();
 }
 
 void DevToolsWindow::UpdateFrontendDockSide() {
   base::StringValue dock_side(SideToString(dock_side_));
   CallClientFunction("InspectorFrontendAPI.setDockSide", &dock_side);
   base::FundamentalValue docked(IsDocked());
   CallClientFunction("InspectorFrontendAPI.setAttachedWindow", &docked);
 }
 
 
@@ skipping 316 matching lines @@
   }
 }
 
 void DevToolsWindow::SetDockSide(const std::string& side) {
   DevToolsDockSide requested_side = SideFromString(side);
   bool dock_requested = requested_side != DEVTOOLS_DOCK_SIDE_UNDOCKED;
   bool is_docked = IsDocked();
 
   content::WebContents* inspected_web_contents = GetInspectedWebContents();
   if (dock_requested && (!inspected_web_contents ||
-      !GetInspectedBrowserWindow() || IsInspectedBrowserPopupOrPanel())) {
+      !GetInspectedBrowserWindow() || IsInspectedBrowserPopup())) {
       // Cannot dock, avoid window flashing due to close-reopen cycle.
     return;
   }
 
   if (dock_side_ != DEVTOOLS_DOCK_SIDE_MINIMIZED &&
       requested_side == DEVTOOLS_DOCK_SIDE_MINIMIZED) {
     dock_side_before_minimized_ = dock_side_;
   }
 
   dock_side_ = requested_side;
@@ skipping 229 matching lines @@
 DevToolsDockSide DevToolsWindow::SideFromString(
     const std::string& dock_side) {
   if (dock_side == kDockSideRight)
     return DEVTOOLS_DOCK_SIDE_RIGHT;
   if (dock_side == kDockSideBottom)
     return DEVTOOLS_DOCK_SIDE_BOTTOM;
   if (dock_side == kDockSideMinimized)
     return DEVTOOLS_DOCK_SIDE_MINIMIZED;
   return DEVTOOLS_DOCK_SIDE_UNDOCKED;
 }