Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient.

apps/app_window.cc

 // Copyright 2014 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 "apps/app_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "apps/app_delegate.h"
 #include "apps/app_web_contents_helper.h"
 #include "apps/app_window_geometry_cache.h"
 #include "apps/app_window_registry.h"
-#include "apps/apps_client.h"
 #include "apps/size_constraints.h"
+#include "apps/ui/apps_client.h"
 #include "apps/ui/native_app_window.h"
 #include "apps/ui/web_contents_sizer.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 192 matching lines @@
                                       frame_insets);
 }
 
 gfx::Size AppWindow::CreateParams::GetWindowMaximumSize(
     const gfx::Insets& frame_insets) const {
   return GetCombinedWindowConstraints(window_spec.maximum_size,
                                       content_spec.maximum_size,
                                       frame_insets);
 }
 
-// AppWindow::Delegate
-
-AppWindow::Delegate::~Delegate() {}
-
 // AppWindow
 
 AppWindow::AppWindow(BrowserContext* context,
                      AppDelegate* app_delegate,
-                     Delegate* delegate,
                      const extensions::Extension* extension)
     : browser_context_(context),
       extension_id_(extension->id()),
       window_type_(WINDOW_TYPE_DEFAULT),
       app_delegate_(app_delegate),
-      delegate_(delegate),
       image_loader_ptr_factory_(this),
       fullscreen_types_(FULLSCREEN_TYPE_NONE),
       show_on_first_paint_(false),
       first_paint_complete_(false),
       has_been_shown_(false),
       can_send_events_(false),
       is_hidden_(false),
       cached_always_on_top_(false),
       requested_transparent_background_(false) {
   extensions::ExtensionsBrowserClient* client =
@@ skipping 30 matching lines @@
   window_type_ = new_params.window_type;
   window_key_ = new_params.window_key;
 
   // Windows cannot be always-on-top in fullscreen mode for security reasons.
   cached_always_on_top_ = new_params.always_on_top;
   if (new_params.state == ui::SHOW_STATE_FULLSCREEN)
     new_params.always_on_top = false;
 
   requested_transparent_background_ = new_params.transparent_background;
 
-  native_app_window_.reset(delegate_->CreateNativeAppWindow(this, new_params));
+  AppsClient* apps_client = AppsClient::Get();
+  native_app_window_.reset(
+      apps_client->CreateNativeAppWindow(this, new_params));
 
   helper_.reset(new AppWebContentsHelper(
       browser_context_, extension_id_, web_contents, app_delegate_.get()));
 
   popup_manager_.reset(
       new web_modal::PopupManager(GetWebContentsModalDialogHost()));
   popup_manager_->RegisterWith(web_contents);
 
   // Prevent the browser process from shutting down while this window exists.
-  AppsClient::Get()->IncrementKeepAliveCount();
+  apps_client->IncrementKeepAliveCount();
   UpdateExtensionAppIcon();
   AppWindowRegistry::Get(browser_context_)->AddAppWindow(this);
 
   if (new_params.hidden) {
     // Although the window starts hidden by default, calling Hide() here
     // notifies observers of the window being hidden.
     Hide();
   } else {
     // Panels are not activated by default.
     Show(window_type_is_panel() || !new_params.focused ? SHOW_INACTIVE
@@ skipping 791 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace apps