Rename apps::ShellWindow to apps::AppWindow

apps/app_shim/app_shim_handler_mac.cc

 // Copyright 2013 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_shim/app_shim_handler_mac.h"
 
 #include <map>
 
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
 namespace apps {
 
 namespace {
 
-void TerminateIfNoShellWindows() {
-  bool shell_windows_left =
-      apps::ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(0);
-  if (!shell_windows_left && !AppListService::Get(
-          chrome::HOST_DESKTOP_TYPE_NATIVE)->IsAppListVisible()) {
+void TerminateIfNoAppWindows() {
+  bool app_windows_left =
+      apps::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(0);
+  if (!app_windows_left &&
+      !AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)
+           ->IsAppListVisible()) {
     chrome::AttemptExit();
   }
 }
 
 class AppShimHandlerRegistry : public content::NotificationObserver {
  public:
   static AppShimHandlerRegistry* GetInstance() {
     return Singleton<AppShimHandlerRegistry,
                      LeakySingletonTraits<AppShimHandlerRegistry> >::get();
   }
@@ skipping 14 matching lines @@
     return inserted_or_removed;
   }
 
   void SetDefaultHandler(AppShimHandler* handler) {
     DCHECK_NE(default_handler_ == NULL, handler == NULL);
     default_handler_ = handler;
   }
 
   void MaybeTerminate() {
     if (!browser_opened_ever_) {
-      // Post this to give ShellWindows a chance to remove themselves from the
+      // Post this to give AppWindows a chance to remove themselves from the
       // registry.
       base::MessageLoop::current()->PostTask(
-          FROM_HERE,
-          base::Bind(&TerminateIfNoShellWindows));
+          FROM_HERE, base::Bind(&TerminateIfNoAppWindows));
     }
   }
 
  private:
   friend struct DefaultSingletonTraits<AppShimHandlerRegistry>;
   typedef std::map<std::string, AppShimHandler*> HandlerMap;
 
   AppShimHandlerRegistry()
       : default_handler_(NULL),
         browser_opened_ever_(false) {
@@ skipping 47 matching lines @@
 void AppShimHandler::SetDefaultHandler(AppShimHandler* handler) {
   AppShimHandlerRegistry::GetInstance()->SetDefaultHandler(handler);
 }
 
 // static
 void AppShimHandler::MaybeTerminate() {
   AppShimHandlerRegistry::GetInstance()->MaybeTerminate();
 }
 
 }  // namespace apps