diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 18:00:39 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 18:00:39 +0000 |
| commit | 9973b94ef09d62aad270494fc1346290130dc9f2 (patch) | |
| tree | bdf8ed8fe5b18934ae9476cad2bd78fe23a68a23 /chrome/browser/dom_ui | |
| parent | 14e336a1b5a8ffe8512c63837599b449fa5540ee (diff) | |
| download | chromium_src-9973b94ef09d62aad270494fc1346290130dc9f2.zip chromium_src-9973b94ef09d62aad270494fc1346290130dc9f2.tar.gz chromium_src-9973b94ef09d62aad270494fc1346290130dc9f2.tar.bz2 | |
Put Chromoting plugin behind a flag.
BUG=48093
TEST=tested that plugin doesn't load w/o --enable-chromoting.
Review URL: http://codereview.chromium.org/2818043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_factory.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc index 9780d33..0d1acff 100644 --- a/chrome/browser/dom_ui/dom_ui_factory.cc +++ b/chrome/browser/dom_ui/dom_ui_factory.cc @@ -114,8 +114,12 @@ static DOMUIFactoryFunction GetDOMUIFactoryFunction(const GURL& url) { if (url.host() == chrome::kChromeUIPluginsHost) return &NewDOMUI<PluginsUI>; #if defined(ENABLE_REMOTING) - if (url.host() == chrome::kChromeUIRemotingHost) - return &NewDOMUI<RemotingUI>; + if (url.host() == chrome::kChromeUIRemotingHost) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableChromoting)) { + return &NewDOMUI<RemotingUI>; + } + } #endif #if defined(OS_CHROMEOS) |