App list: Infrastructure now supports multiple custom launcher pages.

ash/shell/app_list.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
+#include <vector>
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_delegate.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 330 matching lines @@
 
   virtual void ShowForProfileByPath(
       const base::FilePath& profile_path) OVERRIDE {
     // Nothing needs to be done.
   }
 
   virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE {
     return NULL;
   }
 
-  virtual views::View* CreateCustomPageWebView(const gfx::Size& size) OVERRIDE {
-    return NULL;
+  virtual std::vector<views::View*> CreateCustomPageWebViews(
+      const gfx::Size& size) OVERRIDE {
+    return std::vector<views::View*>();
   }
 
   virtual bool IsSpeechRecognitionEnabled() OVERRIDE {
     return false;
   }
 
   scoped_ptr<app_list::AppListModel> model_;
   app_list::SpeechUIModel speech_ui_;
   Users users_;
 
   DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
 };
 
 }  // namespace
 
 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
 }  // namespace shell
 }  // namespace ash