| OLD | NEW |
| 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/omnibox/omnibox_ui_handler.h" | 8 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" |
| 9 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
| 10 #include "content/public/browser/web_ui.h" | 10 #include "content/public/browser/web_ui.h" |
| 11 #include "content/public/browser/web_ui_controller.h" | 11 #include "content/public/browser/web_ui_controller.h" |
| 12 #include "content/public/browser/web_ui_data_source.h" | 12 #include "content/public/browser/web_ui_data_source.h" |
| 13 #include "grit/browser_resources.h" | 13 #include "grit/browser_resources.h" |
| 14 | 14 |
| 15 namespace { |
| 16 |
| 17 struct MojoWebUIHandlerImpl : MojoWebUIHandler { |
| 18 OmniboxUIHandlerMojoPtr ptr; |
| 19 }; |
| 20 |
| 21 } // namespace |
| 22 |
| 15 OmniboxUI::OmniboxUI(content::WebUI* web_ui) : MojoWebUIController(web_ui) { | 23 OmniboxUI::OmniboxUI(content::WebUI* web_ui) : MojoWebUIController(web_ui) { |
| 16 // Set up the chrome://omnibox/ source. | 24 // Set up the chrome://omnibox/ source. |
| 17 content::WebUIDataSource* html_source = | 25 content::WebUIDataSource* html_source = |
| 18 content::WebUIDataSource::Create(chrome::kChromeUIOmniboxHost); | 26 content::WebUIDataSource::Create(chrome::kChromeUIOmniboxHost); |
| 19 html_source->AddResourcePath("omnibox.css", IDR_OMNIBOX_CSS); | 27 html_source->AddResourcePath("omnibox.css", IDR_OMNIBOX_CSS); |
| 20 html_source->AddResourcePath("omnibox.js", IDR_OMNIBOX_JS); | 28 html_source->AddResourcePath("omnibox.js", IDR_OMNIBOX_JS); |
| 21 html_source->SetDefaultResource(IDR_OMNIBOX_HTML); | 29 html_source->SetDefaultResource(IDR_OMNIBOX_HTML); |
| 22 | 30 |
| 23 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), html_source); | 31 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), html_source); |
| 24 | 32 |
| 25 AddMojoResourcePath("chrome/browser/ui/webui/omnibox/omnibox.mojom", | 33 AddMojoResourcePath("chrome/browser/ui/webui/omnibox/omnibox.mojom", |
| 26 IDR_OMNIBOX_MOJO_JS); | 34 IDR_OMNIBOX_MOJO_JS); |
| 27 } | 35 } |
| 28 | 36 |
| 29 OmniboxUI::~OmniboxUI() {} | 37 OmniboxUI::~OmniboxUI() {} |
| 30 | 38 |
| 31 scoped_ptr<MojoWebUIHandler> OmniboxUI::CreateUIHandler( | 39 scoped_ptr<MojoWebUIHandler> OmniboxUI::CreateUIHandler( |
| 32 mojo::ScopedMessagePipeHandle handle_to_page) { | 40 mojo::ScopedMessagePipeHandle handle_to_page) { |
| 33 return scoped_ptr<MojoWebUIHandler>( | 41 MojoWebUIHandlerImpl* handler = new MojoWebUIHandlerImpl(); |
| 34 new OmniboxUIHandler( | 42 handler->ptr.Bind(new OmniboxUIHandler(Profile::FromWebUI(web_ui()))); |
| 35 ScopedOmniboxPageHandle::From(handle_to_page.Pass()).Pass(), | 43 handler->ptr.ConfigureStub(handle_to_page.Pass()); |
| 36 Profile::FromWebUI(web_ui()))); | 44 return scoped_ptr<MojoWebUIHandler>(handler); |
| 37 } | 45 } |
| OLD | NEW |