Chromium Code Reviews| Index: extensions/shell/browser/shell_app_delegate.h |
| diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h |
| similarity index 59% |
| copy from chrome/browser/ui/apps/chrome_app_delegate.h |
| copy to extensions/shell/browser/shell_app_delegate.h |
| index 382dda45ea511f8f025a256a5622ce9b7973a1d1..7bcdfd9c7850caad2fbc0f80d32048dd128c7c24 100644 |
| --- a/chrome/browser/ui/apps/chrome_app_delegate.h |
| +++ b/extensions/shell/browser/shell_app_delegate.h |
| @@ -2,34 +2,19 @@ |
| // 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_APP_DELEGATE_H_ |
| -#define CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ |
| +#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_ |
| +#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_ |
| -#include "base/callback.h" |
| -#include "base/memory/scoped_ptr.h" |
| -#include "content/public/browser/notification_observer.h" |
| -#include "content/public/browser/notification_registrar.h" |
| #include "extensions/browser/app_window/app_delegate.h" |
| -#include "ui/base/window_open_disposition.h" |
| -#include "ui/gfx/rect.h" |
| -namespace content { |
| -class BrowserContext; |
| -class WebContents; |
| -} |
| +namespace extensions { |
| -class ChromeAppDelegate : public extensions::AppDelegate, |
| - public content::NotificationObserver { |
| +class ShellAppDelegate : public AppDelegate { |
|
James Cook
2014/09/05 16:26:42
Can you add a brief comment about this class?
hashimoto
2014/09/05 17:37:17
Done.
|
| public: |
| - ChromeAppDelegate(); |
| - virtual ~ChromeAppDelegate(); |
| + ShellAppDelegate(); |
| + virtual ~ShellAppDelegate(); |
| - static void DisableExternalOpenForTesting(); |
| - |
| - private: |
| - class NewWindowContentsDelegate; |
| - |
| - // extensions::AppDelegate: |
| + // AppsClient overrides: |
|
James Cook
2014/09/05 16:26:42
AppDelegate overrides?
hashimoto
2014/09/05 17:37:17
Oops, done.
|
| virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE; |
| virtual void ResizeWebContents(content::WebContents* web_contents, |
| const gfx::Size& size) OVERRIDE; |
| @@ -53,7 +38,7 @@ class ChromeAppDelegate : public extensions::AppDelegate, |
| content::WebContents* web_contents, |
| const content::MediaStreamRequest& request, |
| const content::MediaResponseCallback& callback, |
| - const extensions::Extension* extension) OVERRIDE; |
| + const Extension* extension) OVERRIDE; |
| virtual int PreferredIconSize() OVERRIDE; |
| virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE; |
| virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
| @@ -62,16 +47,10 @@ class ChromeAppDelegate : public extensions::AppDelegate, |
| content::WebContents* web_contents) OVERRIDE; |
| virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; |
| - // content::NotificationObserver: |
| - virtual void Observe(int type, |
| - const content::NotificationSource& source, |
| - const content::NotificationDetails& details) OVERRIDE; |
| - |
| - scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_; |
| - base::Closure terminating_callback_; |
| - content::NotificationRegistrar registrar_; |
| - |
| - DISALLOW_COPY_AND_ASSIGN(ChromeAppDelegate); |
| + private: |
| + DISALLOW_COPY_AND_ASSIGN(ShellAppDelegate); |
| }; |
| -#endif // CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ |
| +} // namespace extensions |
| + |
| +#endif // EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_ |