Rename ChromeShellWindowDelegate to ChromeAppWindowDelegate

chrome/browser/ui/apps/chrome_app_window_delegate.h

Index: chrome/browser/ui/apps/chrome_app_window_delegate.h
diff --git a/chrome/browser/ui/apps/chrome_shell_window_delegate.h b/chrome/browser/ui/apps/chrome_app_window_delegate.h
similarity index 77%
rename from chrome/browser/ui/apps/chrome_shell_window_delegate.h
rename to chrome/browser/ui/apps/chrome_app_window_delegate.h
index 21897d4b743a03f8123a35a1b1c11a2b49f6b09c..a96bd7896b32c0460d82deda74b86fd60cd86c6a 100644
--- a/chrome/browser/ui/apps/chrome_shell_window_delegate.h
+++ b/chrome/browser/ui/apps/chrome_app_window_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_APPS_CHROME_SHELL_WINDOW_DELEGATE_H_
-#define CHROME_BROWSER_UI_APPS_CHROME_SHELL_WINDOW_DELEGATE_H_
+#ifndef CHROME_BROWSER_UI_APPS_CHROME_APP_WINDOW_DELEGATE_H_
+#define CHROME_BROWSER_UI_APPS_CHROME_APP_WINDOW_DELEGATE_H_
 
 #include "apps/app_window.h"
 #include "base/memory/scoped_ptr.h"
@@ -16,24 +16,23 @@ namespace content {
 class BrowserContext;
 }
 
-class ShellWindowLinkDelegate : public content::WebContentsDelegate {
+class AppWindowLinkDelegate : public content::WebContentsDelegate {
  public:
-  ShellWindowLinkDelegate();
-  virtual ~ShellWindowLinkDelegate();
+  AppWindowLinkDelegate();
+  virtual ~AppWindowLinkDelegate();
 
  private:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
 
-  DISALLOW_COPY_AND_ASSIGN(ShellWindowLinkDelegate);
+  DISALLOW_COPY_AND_ASSIGN(AppWindowLinkDelegate);
 };
 
-// TODO(jamescook): Rename to ChromeAppWindowDelegate. http://crbug.com/344084
-class ChromeShellWindowDelegate : public apps::AppWindow::Delegate {
+class ChromeAppWindowDelegate : public apps::AppWindow::Delegate {
  public:
-  ChromeShellWindowDelegate();
-  virtual ~ChromeShellWindowDelegate();
+  ChromeAppWindowDelegate();
+  virtual ~ChromeAppWindowDelegate();
 
   static void DisableExternalOpenForTesting();
 
@@ -75,9 +74,9 @@ class ChromeShellWindowDelegate : public apps::AppWindow::Delegate {
       apps::AppWindow* window,
       const apps::AppWindow::CreateParams& params);
 
-  scoped_ptr<ShellWindowLinkDelegate> shell_window_link_delegate_;
+  scoped_ptr<AppWindowLinkDelegate> app_window_link_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeShellWindowDelegate);
+  DISALLOW_COPY_AND_ASSIGN(ChromeAppWindowDelegate);
 };
 
-#endif  // CHROME_BROWSER_UI_APPS_CHROME_SHELL_WINDOW_DELEGATE_H_
+#endif  // CHROME_BROWSER_UI_APPS_CHROME_APP_WINDOW_DELEGATE_H_