Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: chrome/browser/ui/webui/omnibox/omnibox_ui.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Made ChromeURLDataManager's destructor virtual Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" 5 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
8 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 9 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
9 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" 10 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h"
10 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
11 #include "content/public/browser/web_ui.h" 12 #include "content/public/browser/web_ui.h"
12 #include "content/public/browser/web_ui_controller.h" 13 #include "content/public/browser/web_ui_controller.h"
13 #include "grit/browser_resources.h" 14 #include "grit/browser_resources.h"
14 15
15 OmniboxUI::OmniboxUI(content::WebUI* web_ui) 16 OmniboxUI::OmniboxUI(content::WebUI* web_ui)
16 : content::WebUIController(web_ui) { 17 : content::WebUIController(web_ui) {
17 // Set up the chrome://omnibox/ source. 18 // Set up the chrome://omnibox/ source.
18 ChromeWebUIDataSource* html_source = 19 ChromeWebUIDataSource* html_source =
19 new ChromeWebUIDataSource(chrome::kChromeUIOmniboxHost); 20 new ChromeWebUIDataSource(chrome::kChromeUIOmniboxHost);
20 html_source->add_resource_path("omnibox.css", IDR_OMNIBOX_CSS); 21 html_source->add_resource_path("omnibox.css", IDR_OMNIBOX_CSS);
21 html_source->add_resource_path("omnibox.js", IDR_OMNIBOX_JS); 22 html_source->add_resource_path("omnibox.js", IDR_OMNIBOX_JS);
22 html_source->set_default_resource(IDR_OMNIBOX_HTML); 23 html_source->set_default_resource(IDR_OMNIBOX_HTML);
23 24
24 Profile* profile = Profile::FromWebUI(web_ui); 25 Profile* profile = Profile::FromWebUI(web_ui);
25 profile->GetChromeURLDataManager()->AddDataSource(html_source); 26 ChromeURLDataManager::AddDataSource(profile, html_source);
26 27
27 // AddMessageHandler takes ownership of OmniboxUIHandler 28 // AddMessageHandler takes ownership of OmniboxUIHandler
28 web_ui->AddMessageHandler(new OmniboxUIHandler(profile)); 29 web_ui->AddMessageHandler(new OmniboxUIHandler(profile));
29 } 30 }
30 31
31 OmniboxUI::~OmniboxUI() { } 32 OmniboxUI::~OmniboxUI() { }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/suggestions_page_handler.cc ('k') | chrome/browser/ui/webui/options2/browser_options_handler2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698