Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: extensions/shell/browser/shell_app_delegate.h

Issue 547593002: Add ShellAppsClient, ShellAppDelegate, ShellNativeAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apifeatures
Patch Set: Address comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..6e58e17fc835deb01e711fca793fd7ffd9c2e5bf 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.h
+++ b/extensions/shell/browser/shell_app_delegate.h
@@ -2,34 +2,20 @@
// 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 {
+// app_shell's AppDelegate implementation.
+class ShellAppDelegate : public AppDelegate {
public:
- ChromeAppDelegate();
- virtual ~ChromeAppDelegate();
+ ShellAppDelegate();
+ virtual ~ShellAppDelegate();
- static void DisableExternalOpenForTesting();
-
- private:
- class NewWindowContentsDelegate;
-
- // extensions::AppDelegate:
+ // AppDelegate overrides:
virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE;
virtual void ResizeWebContents(content::WebContents* web_contents,
const gfx::Size& size) OVERRIDE;
@@ -53,7 +39,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 +48,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_

Powered by Google App Engine
This is Rietveld 408576698