Move the parsing of "chrome_url_overrides" out of Extension.

chrome/browser/ui/webui/uber/uber_ui.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/webui/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
@@ skipping 37 matching lines @@
   return source;
 }
 
 // Determines whether the user has an active extension of the given type.
 bool HasExtensionType(Profile* profile, const char* extensionType) {
   const ExtensionSet* extensionSet =
       profile->GetExtensionService()->extensions();
 
   for (ExtensionSet::const_iterator iter = extensionSet->begin();
        iter != extensionSet->end(); ++iter) {
-    extensions::Extension::URLOverrideMap map =
-        (*iter)->GetChromeURLOverrides();
-    extensions::Extension::URLOverrideMap::const_iterator result =
-        map.find(std::string(extensionType));
+    const extensions::URLOverrides::URLOverrideMap* map =
+        extensions::URLOverrides::GetChromeURLOverrides(*iter);
+    if (!map)
+      continue;
+    extensions::URLOverrides::URLOverrideMap::const_iterator result =
+        map->find(std::string(extensionType));
 
-    if (result != map.end())
+    if (result != map->end())
       return true;
   }
 
   return false;
 }
 
 ChromeWebUIDataSource* CreateUberFrameHTMLSource(Profile* profile) {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIUberFrameHost);
 
@@ skipping 124 matching lines @@
       scoped_ptr<Value> overrideValue(
           Value::CreateStringValue(overridesHistory ? "yes" : "no"));
       web_ui()->CallJavascriptFunction(
           "uber_frame.setNavigationOverride", *controlsValue, *overrideValue);
       break;
     }
     default:
       NOTREACHED();
   }
 }