reland: Remove WINDOW_TYPE_V1_PANEL AppWindow type

chrome/browser/extensions/api/tabs/tabs_api.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/api/tabs/tabs_api.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <memory>
@@ skipping 77 matching lines @@
 #include "extensions/common/message_bundle.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/user_script.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/base/ui_base_types.h"
 
-#if defined(USE_ASH)
-#include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"  // nogncheck
-#include "extensions/browser/app_window/app_window_registry.h"  // nogncheck
-#endif
-
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 using zoom::ZoomController;
 
 namespace extensions {
 
@@ skipping 365 matching lines @@
 
     if (source_browser->profile() != window_profile)
       return RespondNow(Error(keys::kCanOnlyMoveTabsWithinSameProfileError));
   }
 
   if (!IsValidStateForWindowsCreateFunction(create_data))
     return RespondNow(Error(keys::kInvalidWindowStateError));
 
   Browser::Type window_type = Browser::TYPE_TABBED;
 
-#if defined(USE_ASH)
-  bool create_ash_panel = false;
-  bool saw_focus_key = false;
-#endif  // defined(USE_ASH)
-
   gfx::Rect window_bounds;
   bool focused = true;
   std::string extension_id;
 
   if (create_data) {
     // Report UMA stats to decide when to remove the deprecated "docked" windows
     // state (crbug.com/703733).
     ReportRequestedWindowState(create_data->state);
 
     // Figure out window type before figuring out bounds so that default
     // bounds can be set according to the window type.
     switch (create_data->type) {
       case windows::CREATE_TYPE_POPUP:
         window_type = Browser::TYPE_POPUP;
         extension_id = extension()->id();
         break;
 
       case windows::CREATE_TYPE_PANEL: {
         extension_id = extension()->id();
-#if defined(USE_ASH)
-      // Only ChromeOS' version of chrome.windows.create would create a panel
-      // window. It is whitelisted to Hangouts extension for limited time until
-      // it transitioned to other types of windows.
-        for (const char* id : extension_misc::kHangoutsExtensionIds) {
-          if (extension_id == id) {
-            create_ash_panel = true;
-            break;
-          }
-        }
-#endif  // defined(USE_ASH)
-        // Everything else gets POPUP instead of PANEL.
         // TODO(dimich): Eventually, remove the 'panel' values form valid
         // window.create parameters. However, this is a more breaking change, so
         // for now simply treat it as a POPUP.
         window_type = Browser::TYPE_POPUP;
         break;
       }
 
       case windows::CREATE_TYPE_NONE:
       case windows::CREATE_TYPE_NORMAL:
         break;
@@ skipping 24 matching lines @@
 
     if (create_data->top)
       window_bounds.set_y(*create_data->top);
 
     if (create_data->width)
       window_bounds.set_width(*create_data->width);
 
     if (create_data->height)
       window_bounds.set_height(*create_data->height);
 
-    if (create_data->focused) {
+    if (create_data->focused)
       focused = *create_data->focused;
-#if defined(USE_ASH)
-      saw_focus_key = true;
-#endif
-    }
   }
 
-#if defined(USE_ASH)
-  if (create_ash_panel) {
-    if (urls.empty())
-      urls.push_back(GURL(chrome::kChromeUINewTabURL));
-
-    AppWindow::CreateParams create_params;
-    create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;
-    create_params.window_key = extension_id;
-    create_params.window_spec.bounds = window_bounds;
-    create_params.focused = saw_focus_key && focused;
-    AppWindow* app_window =
-        new AppWindow(window_profile, new ChromeAppDelegate(true), extension());
-    AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);
-    app_window->Init(urls[0], ash_panel_contents, render_frame_host(),
-                     create_params);
-    WindowController* window_controller =
-        WindowControllerList::GetInstance()->FindWindowById(
-            app_window->session_id().id());
-    if (!window_controller)
-      return RespondNow(Error(kUnknownErrorDoNotUse));
-    return RespondNow(
-        OneArgument(window_controller->CreateWindowValueWithTabs(extension())));
-  }
-#endif  // defined(USE_ASH)
-
   // Create a new BrowserWindow.
   Browser::CreateParams create_params(window_type, window_profile,
                                       user_gesture());
   if (extension_id.empty()) {
     create_params.initial_bounds = window_bounds;
   } else {
     create_params = Browser::CreateParams::CreateForApp(
         web_app::GenerateApplicationNameFromExtensionId(extension_id),
         false /* trusted_source */, window_bounds, window_profile,
         user_gesture());
@@ skipping 324 matching lines @@
     for (int i = 0; i < tab_strip->count(); ++i) {
       WebContents* web_contents = tab_strip->GetWebContentsAt(i);
       memory::TabManager* tab_manager = g_browser_process->GetTabManager();
 
       if (index > -1 && i != index)
         continue;
 
       if (!web_contents) {
         continue;
       }
-      
+
       if (!MatchesBool(params->query_info.highlighted.get(),
                        tab_strip->IsTabSelected(i))) {
         continue;
       }
 
       if (!MatchesBool(params->query_info.active.get(),
                        i == tab_strip->active_index())) {
         continue;
       }
 
@@ skipping 1193 matching lines @@
       params->tab_id
           ? ErrorUtils::FormatErrorMessage(keys::kCannotDiscardTab,
                                            base::IntToString(*params->tab_id))
           : keys::kCannotFindTabToDiscard));
 }
 
 TabsDiscardFunction::TabsDiscardFunction() {}
 TabsDiscardFunction::~TabsDiscardFunction() {}
 
 }  // namespace extensions