| Index: chrome/browser/ui/app_list/app_list_view_delegate.h
|
| diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| index 31899f94cee44f5a3f4781e040982dd7d4a59a70..ec67e7489a809580c637413c31ac2702db49a107 100644
|
| --- a/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| +++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/callback_forward.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/scoped_vector.h"
|
| #include "base/observer_list.h"
|
| #include "base/scoped_observer.h"
|
| #include "chrome/browser/profiles/profile_info_cache_observer.h"
|
| @@ -89,7 +90,8 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| const base::FilePath& profile_path) OVERRIDE;
|
| #if defined(TOOLKIT_VIEWS)
|
| virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE;
|
| - virtual views::View* CreateCustomPageWebView(const gfx::Size& size) OVERRIDE;
|
| + virtual std::vector<views::View*> CreateCustomPageWebViews(
|
| + const gfx::Size& size) OVERRIDE;
|
| #endif
|
| virtual bool IsSpeechRecognitionEnabled() OVERRIDE;
|
| virtual const Users& GetUsers() const OVERRIDE;
|
| @@ -154,8 +156,8 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| // this instance can be removed as an observer on its destruction.
|
| ScopedObserver<SigninManagerBase, AppListViewDelegate> scoped_observer_;
|
|
|
| - // Window contents of the additional custom launcher page. May be NULL.
|
| - scoped_ptr<apps::CustomLauncherPageContents> custom_page_contents_;
|
| + // Window contents of additional custom launcher pages.
|
| + ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
|
| };
|
|
|