| Index: chrome/browser/ui/apps/chrome_app_delegate.h
|
| diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h
|
| index 1c083aa072d711a99d055db769c37a0a5e71e908..bc63fa16e4b7b287b9f658e4c35365e2ea889265 100644
|
| --- a/chrome/browser/ui/apps/chrome_app_delegate.h
|
| +++ b/chrome/browser/ui/apps/chrome_app_delegate.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_
|
| #define CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_
|
|
|
| -#include "apps/app_delegate.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "extensions/browser/app_window/app_delegate.h"
|
| #include "ui/base/window_open_disposition.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| @@ -15,7 +15,7 @@ class BrowserContext;
|
| class WebContents;
|
| }
|
|
|
| -class ChromeAppDelegate : public apps::AppDelegate {
|
| +class ChromeAppDelegate : public extensions::AppDelegate {
|
| public:
|
| ChromeAppDelegate();
|
| virtual ~ChromeAppDelegate();
|
| @@ -25,7 +25,7 @@ class ChromeAppDelegate : public apps::AppDelegate {
|
| private:
|
| class NewWindowContentsDelegate;
|
|
|
| - // apps::AppDelegate:
|
| + // extensions::AppDelegate:
|
| virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE;
|
| virtual content::WebContents* OpenURLFromTab(
|
| content::BrowserContext* context,
|
|
|