Added proper extension manifest parser for launcher_page.

chrome/browser/ui/app_list/app_list_view_delegate.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 "chrome/browser/ui/app_list/app_list_view_delegate.h"
 
 #include <vector>
 
 #include "apps/custom_launcher_page_contents.h"
 #include "base/callback.h"
@@ skipping 23 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_handlers/launcher_page_info.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate_observer.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/webview/webview.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/controls/webview/webview.h"
@@ skipping 72 matching lines @@
 
   // Search the list of installed extensions for ones with 'launcher_page'.
   extensions::ExtensionRegistry* extension_registry =
       extensions::ExtensionRegistry::Get(browser_context);
   const extensions::ExtensionSet& enabled_extensions =
       extension_registry->enabled_extensions();
   for (extensions::ExtensionSet::const_iterator it = enabled_extensions.begin();
        it != enabled_extensions.end();
        ++it) {
     const extensions::Extension* extension = it->get();
-    const extensions::Manifest* manifest = extension->manifest();
-    if (!manifest->HasKey(extensions::manifest_keys::kLauncherPage))
+    extensions::LauncherPageInfo* info =
+        extensions::LauncherPageHandler::GetInfo(extension);
+    if (!info)
       continue;
-    std::string launcher_page_page;
-    if (!manifest->GetString(extensions::manifest_keys::kLauncherPagePage,
-                             &launcher_page_page)) {
-      // TODO(mgiuca): Add a proper manifest parser to catch this error properly
-      // and display it on the extensions page.
-      LOG(ERROR) << "Extension " << extension->id() << ": "
-                 << extensions::manifest_keys::kLauncherPage
-                 << " has no 'page' attribute; will be ignored.";
-      continue;
-    }
-    urls->push_back(extension->GetResourceURL(launcher_page_page));
+
+    urls->push_back(extension->GetResourceURL(info->page));
   }
 }
 
 }  // namespace
 
 AppListViewDelegate::AppListViewDelegate(Profile* profile,
                                          AppListControllerDelegate* controller)
     : controller_(controller),
       profile_(profile),
       model_(NULL),
@@ skipping 435 matching lines @@
 
 void AppListViewDelegate::AddObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppListViewDelegate::RemoveObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }