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

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

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing
Patch Set: add 'define' to global interface expectations for AMD in layout tests Created 4 years, 11 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 <utility> 7 #include <utility>
8 8
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" 10 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "content/public/browser/web_ui.h" 12 #include "content/public/browser/web_ui.h"
13 #include "content/public/browser/web_ui_controller.h" 13 #include "content/public/browser/web_ui_controller.h"
14 #include "content/public/browser/web_ui_data_source.h" 14 #include "content/public/browser/web_ui_data_source.h"
15 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
16 16
17 OmniboxUI::OmniboxUI(content::WebUI* web_ui) : MojoWebUIController(web_ui) { 17 OmniboxUI::OmniboxUI(content::WebUI* web_ui) : MojoWebUIController(web_ui) {
18 // Set up the chrome://omnibox/ source. 18 // Set up the chrome://omnibox/ source.
19 content::WebUIDataSource* source = 19 content::WebUIDataSource* source =
20 content::WebUIDataSource::Create(chrome::kChromeUIOmniboxHost); 20 content::WebUIDataSource::Create(chrome::kChromeUIOmniboxHost);
21 source->AddResourcePath("omnibox.css", IDR_OMNIBOX_CSS); 21 source->AddResourcePath("omnibox.css", IDR_OMNIBOX_CSS);
22 source->AddResourcePath("omnibox.js", IDR_OMNIBOX_JS); 22 source->AddResourcePath("omnibox.js", IDR_OMNIBOX_JS);
23 source->AddResourcePath("chrome/browser/ui/webui/omnibox/omnibox.mojom", 23 source->AddResourcePath("chrome/browser/ui/webui/omnibox/omnibox.mojom",
24 IDR_OMNIBOX_MOJO_JS); 24 IDR_OMNIBOX_MOJO_JS);
25 source->AddMojoResources();
26 source->SetDefaultResource(IDR_OMNIBOX_HTML); 25 source->SetDefaultResource(IDR_OMNIBOX_HTML);
27 26
28 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source); 27 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source);
29 } 28 }
30 29
31 OmniboxUI::~OmniboxUI() {} 30 OmniboxUI::~OmniboxUI() {}
32 31
33 void OmniboxUI::BindUIHandler( 32 void OmniboxUI::BindUIHandler(
34 mojo::InterfaceRequest<OmniboxUIHandlerMojo> request) { 33 mojo::InterfaceRequest<OmniboxUIHandlerMojo> request) {
35 omnibox_ui_handler_.reset( 34 omnibox_ui_handler_.reset(
36 new OmniboxUIHandler(Profile::FromWebUI(web_ui()), std::move(request))); 35 new OmniboxUIHandler(Profile::FromWebUI(web_ui()), std::move(request)));
37 } 36 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698