chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 11555033: Adding local html page used in Instant Extended mode when instant is disabled or unavailable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 11555033: Adding local html page used in Instant Extended mode when instant is disabled or unavailable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/local_omnibox_popup/local_omnibox_popup.js ('K') | « chrome/browser/ui/search/search.cc ('k') | chrome/browser/ui/webui/local_omnibox_popup/local_omnibox_popup_handler.h » ('j') | chrome/browser/ui/webui/local_omnibox_popup/local_omnibox_popup_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index 7201c29beb35911a31d0bc85be77c5beac1d0c1b..9ddd4fe26b076884318becae07462ad0077e8e49 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -35,6 +35,7 @@

#include "chrome/browser/ui/webui/history_ui.h"

#include "chrome/browser/ui/webui/inspect_ui.h"

#include "chrome/browser/ui/webui/instant_ui.h"

+#include "chrome/browser/ui/webui/local_omnibox_popup/local_omnibox_popup_ui.h"

#include "chrome/browser/ui/webui/media/media_internals_ui.h"

#if !defined(DISABLE_NACL)

#include "chrome/browser/ui/webui/nacl_ui.h"

@@ -205,6 +206,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<HistoryUI>;

if (url.host() == chrome::kChromeUIInstantHost)

return &NewWebUI<InstantUI>;

+ if (url.host() == chrome::kChromeUILocalOmniboxPopupHost)

+ return &NewWebUI<LocalOmniboxPopupUI>;

if (url.host() == chrome::kChromeUIMediaInternalsHost)

return &NewWebUI<MediaInternalsUI>;

#if !defined(DISABLE_NACL)