Rename apps::ShellWindow to apps::AppWindow

chrome/browser/extensions/api/app_window/app_window_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/app_window/app_window_api.h"
 
+#include "apps/app_window.h"
 #include "apps/app_window_contents.h"
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/switches.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
-using apps::ShellWindow;
+using apps::AppWindow;
 
 namespace app_window = extensions::api::app_window;
 namespace Create = app_window::Create;
 
 namespace extensions {
 
 namespace app_window_constants {
 const char kInvalidWindowId[] =
     "The window id can not be more than 256 characters long.";
 }
@@ skipping 51 matching lines @@
   // path.
   if (GetExtension()->location() == extensions::Manifest::COMPONENT) {
     GURL absolute = GURL(params->url);
     if (absolute.has_scheme())
       url = absolute;
   }
 
   bool inject_html_titlebar = false;
 
   // TODO(jeremya): figure out a way to pass the opening WebContents through to
-  // ShellWindow::Create so we can set the opener at create time rather than
+  // AppWindow::Create so we can set the opener at create time rather than
   // with a hack in AppWindowCustomBindings::GetView().
-  ShellWindow::CreateParams create_params;
+  AppWindow::CreateParams create_params;
   app_window::CreateWindowOptions* options = params->options.get();
   if (options) {
     if (options->id.get()) {
       // TODO(mek): use URL if no id specified?
       // Limit length of id to 256 characters.
       if (options->id->length() > 256) {
         error_ = app_window_constants::kInvalidWindowId;
         return false;
       }
 
       create_params.window_key = *options->id;
 
       if (options->singleton && *options->singleton == false) {
         WriteToConsole(
           content::CONSOLE_MESSAGE_LEVEL_WARNING,
           "The 'singleton' option in chrome.apps.window.create() is deprecated!"
           " Change your code to no longer rely on this.");
       }
 
       if (!options->singleton || *options->singleton) {
-        ShellWindow* window = apps::ShellWindowRegistry::Get(
-            GetProfile())->GetShellWindowForAppAndKey(extension_id(),
-                                                      create_params.window_key);
+        AppWindow* window = apps::AppWindowRegistry::Get(GetProfile())
+                                ->GetAppWindowForAppAndKey(
+                                      extension_id(), create_params.window_key);
         if (window) {
           content::RenderViewHost* created_view =
               window->web_contents()->GetRenderViewHost();
           int view_id = MSG_ROUTING_NONE;
           if (render_view_host_->GetProcess()->GetID() ==
               created_view->GetProcess()->GetID()) {
             view_id = created_view->GetRoutingID();
           }
 
           if (options->focused.get() && !*options->focused.get())
-            window->Show(ShellWindow::SHOW_INACTIVE);
+            window->Show(AppWindow::SHOW_INACTIVE);
           else
-            window->Show(ShellWindow::SHOW_ACTIVE);
+            window->Show(AppWindow::SHOW_ACTIVE);
 
           base::DictionaryValue* result = new base::DictionaryValue;
           result->Set("viewId", new base::FundamentalValue(view_id));
           window->GetSerializedState(result);
           result->SetBoolean("existingWindow", true);
           result->SetBoolean("injectTitlebar", false);
           SetResult(result);
           SendResponse(true);
           return true;
         }
@@ skipping 28 matching lines @@
         create_params.bounds.set_height(*bounds->height.get());
       if (bounds->left.get())
         create_params.bounds.set_x(*bounds->left.get());
       if (bounds->top.get())
         create_params.bounds.set_y(*bounds->top.get());
     }
 
     if (GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV ||
         GetExtension()->location() == extensions::Manifest::COMPONENT) {
       if (options->type == extensions::api::app_window::WINDOW_TYPE_PANEL) {
-          create_params.window_type = ShellWindow::WINDOW_TYPE_PANEL;
+        create_params.window_type = AppWindow::WINDOW_TYPE_PANEL;
       }
     }
 
     if (options->frame.get()) {
       if (*options->frame == kHtmlFrameOption &&
           (GetExtension()->HasAPIPermission(APIPermission::kExperimental) ||
            CommandLine::ForCurrentProcess()->HasSwitch(
                switches::kEnableExperimentalExtensionApis))) {
-        create_params.frame = ShellWindow::FRAME_NONE;
+        create_params.frame = AppWindow::FRAME_NONE;
         inject_html_titlebar = true;
       } else if (*options->frame == kNoneFrameOption) {
-        create_params.frame = ShellWindow::FRAME_NONE;
+        create_params.frame = AppWindow::FRAME_NONE;
       } else {
-        create_params.frame = ShellWindow::FRAME_CHROME;
+        create_params.frame = AppWindow::FRAME_CHROME;
       }
     }
 
     if (options->transparent_background.get() &&
         (GetExtension()->HasAPIPermission(APIPermission::kExperimental) ||
          CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kEnableExperimentalExtensionApis))) {
       create_params.transparent_background = *options->transparent_background;
     }
 
@@ skipping 35 matching lines @@
         case extensions::api::app_window::STATE_MINIMIZED:
           create_params.state = ui::SHOW_STATE_MINIMIZED;
           break;
       }
     }
   }
 
   create_params.creator_process_id =
       render_view_host_->GetProcess()->GetID();
 
-  ShellWindow* shell_window = new ShellWindow(
+  AppWindow* app_window = new AppWindow(
       GetProfile(), new ChromeShellWindowDelegate(), GetExtension());
-  shell_window->Init(url,
-                     new apps::AppWindowContents(shell_window),
-                     create_params);
+  app_window->Init(
+      url, new apps::AppWindowContentsImpl(app_window), create_params);
 
   if (chrome::IsRunningInForcedAppMode())
-    shell_window->ForcedFullscreen();
+    app_window->ForcedFullscreen();
 
   content::RenderViewHost* created_view =
-      shell_window->web_contents()->GetRenderViewHost();
+      app_window->web_contents()->GetRenderViewHost();
   int view_id = MSG_ROUTING_NONE;
   if (create_params.creator_process_id == created_view->GetProcess()->GetID())
     view_id = created_view->GetRoutingID();
 
   base::DictionaryValue* result = new base::DictionaryValue;
   result->Set("viewId", new base::FundamentalValue(view_id));
   result->Set("injectTitlebar",
       new base::FundamentalValue(inject_html_titlebar));
-  result->Set("id", new base::StringValue(shell_window->window_key()));
-  shell_window->GetSerializedState(result);
+  result->Set("id", new base::StringValue(app_window->window_key()));
+  app_window->GetSerializedState(result);
   SetResult(result);
 
-  if (apps::ShellWindowRegistry::Get(GetProfile())
+  if (apps::AppWindowRegistry::Get(GetProfile())
           ->HadDevToolsAttached(created_view)) {
     new DevToolsRestorer(this, created_view);
     return true;
   }
 
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions