Rename apps::ShellWindow to apps::AppWindow

chrome/browser/extensions/api/identity/web_auth_flow.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IDENTITY_WEB_AUTH_FLOW_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_WEB_AUTH_FLOW_H_
 
 #include <string>
 
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
 class Profile;
 class WebAuthFlowTest;
 
 namespace content {
@@ skipping 17 matching lines @@
 //
 // The window is not displayed until the first page load
 // completes. This allows the flow to complete without flashing a
 // window on screen if the provider immediately redirects to the
 // target URL.
 //
 // A WebAuthFlow can be started in Mode::SILENT, which never displays
 // a window. If a window would be required, the flow fails.
 class WebAuthFlow : public content::NotificationObserver,
                     public content::WebContentsObserver,
-                    public apps::ShellWindowRegistry::Observer {
+                    public apps::AppWindowRegistry::Observer {
  public:
   enum Mode {
     INTERACTIVE,  // Show UI to the user if necessary.
     SILENT        // No UI should be shown.
   };
 
   enum Failure {
     WINDOW_CLOSED,  // Window closed by user.
     INTERACTION_REQUIRED,  // Non-redirect page load in silent mode.
     LOAD_FAILED
@@ skipping 25 matching lines @@
 
   // Starts the flow.
   virtual void Start();
 
   // Prevents further calls to the delegate and deletes the flow.
   void DetachDelegateAndDelete();
 
  private:
   friend class ::WebAuthFlowTest;
 
-  // ::ShellWindowRegistry::Observer implementation.
-  virtual void OnShellWindowAdded(apps::ShellWindow* shell_window) OVERRIDE;
-  virtual void OnShellWindowIconChanged(apps::ShellWindow* shell_window)
-      OVERRIDE;
-  virtual void OnShellWindowRemoved(apps::ShellWindow* shell_window) OVERRIDE;
+  // ::AppWindowRegistry::Observer implementation.
+  virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
+  virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) OVERRIDE;
+  virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // WebContentsObserver implementation.
   virtual void DidStopLoading(content::RenderViewHost* render_view_host)
       OVERRIDE;
   virtual void DidNavigateMainFrame(
@@ skipping 18 matching lines @@
       OVERRIDE;
 
   void BeforeUrlLoaded(const GURL& url);
   void AfterUrlLoaded();
 
   Delegate* delegate_;
   Profile* profile_;
   GURL provider_url_;
   Mode mode_;
 
-  apps::ShellWindow* shell_window_;
-  std::string shell_window_key_;
+  apps::AppWindow* app_window_;
+  std::string app_window_key_;
   bool embedded_window_created_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebAuthFlow);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IDENTITY_WEB_AUTH_FLOW_H_