Move AppWindow to extensions

chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_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_current_window_internal/app_current_window_internal_api.h"
 
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_current_window_internal.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/features/feature_channel.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/app_window/size_constraints.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 namespace app_current_window_internal =
     extensions::api::app_current_window_internal;
 
 namespace Show = app_current_window_internal::Show;
 namespace SetBounds = app_current_window_internal::SetBounds;
 namespace SetSizeConstraints = app_current_window_internal::SetSizeConstraints;
 namespace SetIcon = app_current_window_internal::SetIcon;
 namespace SetBadgeIcon = app_current_window_internal::SetBadgeIcon;
 namespace SetShape = app_current_window_internal::SetShape;
 namespace SetAlwaysOnTop = app_current_window_internal::SetAlwaysOnTop;
 
-using apps::AppWindow;
 using app_current_window_internal::Bounds;
 using app_current_window_internal::Region;
 using app_current_window_internal::RegionRect;
 using app_current_window_internal::SizeConstraints;
 
 namespace extensions {
 
 namespace {
 
 const char kNoAssociatedAppWindow[] =
@@ skipping 69 matching lines @@
     return OUTER_BOUNDS;
   else if (type_as_string == kDeprecatedBoundsType)
     return DEPRECATED_BOUNDS;
   else
     return INVALID_TYPE;
 }
 
 }  // namespace bounds
 
 bool AppCurrentWindowInternalExtensionFunction::RunSync() {
-  apps::AppWindowRegistry* registry =
-      apps::AppWindowRegistry::Get(GetProfile());
+  AppWindowRegistry* registry = AppWindowRegistry::Get(GetProfile());
   DCHECK(registry);
   content::RenderViewHost* rvh = render_view_host();
   if (!rvh)
     // No need to set an error, since we won't return to the caller anyway if
     // there's no RVH.
     return false;
   AppWindow* window = registry->GetAppWindowForRenderViewHost(rvh);
   if (!window) {
     error_ = kNoAssociatedAppWindow;
     return false;
@@ skipping 260 matching lines @@
   }
 
   scoped_ptr<SetAlwaysOnTop::Params> params(
       SetAlwaysOnTop::Params::Create(*args_));
   CHECK(params.get());
   window->SetAlwaysOnTop(params->always_on_top);
   return true;
 }
 
 }  // namespace extensions