Move history API out of experimental. Allow extensions to override history page.

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 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/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 88 matching lines @@
 };
 
 const int Extension::kPageActionIconMaxSize = 19;
 const int Extension::kBrowserActionIconMaxSize = 19;
 
 const char* Extension::kTabPermission = "tabs";
 const char* Extension::kBookmarkPermission = "bookmarks";
 const char* Extension::kNotificationPermission = "notifications";
 const char* Extension::kExperimentalPermission = "experimental";
 const char* Extension::kUnlimitedStoragePermission = "unlimited_storage";
+const char* Extension::kHistoryPermission = "history";
 
 const char* Extension::kPermissionNames[] = {
   Extension::kTabPermission,
   Extension::kBookmarkPermission,
   Extension::kNotificationPermission,
   Extension::kExperimentalPermission,
-  Extension::kUnlimitedStoragePermission
+  Extension::kUnlimitedStoragePermission,
+  Extension::kHistoryPermission
 };
 const size_t Extension::kNumPermissions =
     arraysize(Extension::kPermissionNames);
 
 Extension::~Extension() {
 }
 
 const std::string Extension::VersionString() const {
   return version_->GetString();
 }
@@ skipping 1238 matching lines @@
     DictionaryValue* overrides;
     if (!source.GetDictionary(keys::kChromeURLOverrides, &overrides)) {
       *error = errors::kInvalidChromeURLOverrides;
       return false;
     }
 
     // Validate that the overrides are all strings
     for (DictionaryValue::key_iterator iter = overrides->begin_keys();
          iter != overrides->end_keys(); ++iter) {
       std::string page = WideToUTF8(*iter);
-      // For now, only allow the new tab page.  Others will work when we remove
-      // this check, but let's keep it simple for now.
-      // TODO(erikkay) enable other pages as well
       std::string val;
+      // Restrict override pages to a list of supported URLs.
       if ((page != chrome::kChromeUINewTabHost &&
-           page != chrome::kChromeUIBookmarksHost) ||
+           page != chrome::kChromeUIBookmarksHost &&
+           page != chrome::kChromeUIHistoryHost) ||
           !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
         *error = errors::kInvalidChromeURLOverrides;
         return false;
       }
       // Replace the entry with a fully qualified chrome-extension:// URL.
       chrome_url_overrides_[page] = GetResourceURL(val);
     }
+
+    // An extension may override at most one page.
+    if (overrides->size() > 1) {
+      *error = errors::kMultipleOverrides;
+      return false;
+    }
   }
 
   if (!CheckAppsAreEnabled(manifest_value_.get(), error) ||
       !LoadWebContentEnabled(manifest_value_.get(), error) ||
       !LoadWebOrigin(manifest_value_.get(), error) ||
       !LoadWebPaths(manifest_value_.get(), error) ||
       !LoadLaunchURL(manifest_value_.get(), error) ||
       !LoadLaunchContainer(manifest_value_.get(), error)) {
     return false;
   }
@@ skipping 196 matching lines @@
         } else {
           return false;
         }
       } else {
         return true;
       }
     }
   }
   return false;
 }