summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/instant_ui.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-27 23:54:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-27 23:54:53 +0000
commit24ea7a17338ce6ed2621aeaeb5542edf5b07d098 (patch)
treefdbf45cf0ba6af23069b542d5491867da692d980 /chrome/browser/ui/webui/instant_ui.cc
parentd017a7046c34bb37a980e0a1a4fd20ec44ba7c78 (diff)
downloadchromium_src-24ea7a17338ce6ed2621aeaeb5542edf5b07d098.zip
chromium_src-24ea7a17338ce6ed2621aeaeb5542edf5b07d098.tar.gz
chromium_src-24ea7a17338ce6ed2621aeaeb5542edf5b07d098.tar.bz2
Stop using content's internal URLDataManager methods from chrome.
BUG=169170 Review URL: https://codereview.chromium.org/12077017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/instant_ui.cc')
-rw-r--r--chrome/browser/ui/webui/instant_ui.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc
index b29bf8b..14df056 100644
--- a/chrome/browser/ui/webui/instant_ui.cc
+++ b/chrome/browser/ui/webui/instant_ui.cc
@@ -13,10 +13,10 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_instant_controller.h"
-#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_data_source.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "grit/browser_resources.h"
@@ -24,7 +24,7 @@ namespace {
content::WebUIDataSource* CreateInstantHTMLSource() {
content::WebUIDataSource* source =
- ChromeWebUIDataSource::Create(chrome::kChromeUIInstantHost);
+ content::WebUIDataSource::Create(chrome::kChromeUIInstantHost);
source->SetJsonPath("strings.js");
source->AddResourcePath("instant.js", IDR_INSTANT_JS);
source->AddResourcePath("instant.css", IDR_INSTANT_CSS);
@@ -145,7 +145,7 @@ InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) {
// Set up the chrome://instant/ source.
Profile* profile = Profile::FromWebUI(web_ui);
- ChromeURLDataManager::AddWebUIDataSource(profile, CreateInstantHTMLSource());
+ content::WebUIDataSource::Add(profile, CreateInstantHTMLSource());
}
// static