| 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/chrome_web_ui_controller_factory.h" | 5 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 return new chromeos::OobeUI(web_ui, url); | 221 return new chromeos::OobeUI(web_ui, url); |
| 222 } | 222 } |
| 223 | 223 |
| 224 // Special case for chrome://proximity_auth. | 224 // Special case for chrome://proximity_auth. |
| 225 template <> | 225 template <> |
| 226 WebUIController* NewWebUI<proximity_auth::ProximityAuthUI>(WebUI* web_ui, | 226 WebUIController* NewWebUI<proximity_auth::ProximityAuthUI>(WebUI* web_ui, |
| 227 const GURL& url) { | 227 const GURL& url) { |
| 228 content::BrowserContext* browser_context = | 228 content::BrowserContext* browser_context = |
| 229 web_ui->GetWebContents()->GetBrowserContext(); | 229 web_ui->GetWebContents()->GetBrowserContext(); |
| 230 return new proximity_auth::ProximityAuthUI( | 230 return new proximity_auth::ProximityAuthUI( |
| 231 web_ui, EasyUnlockServiceFactory::GetForBrowserContext(browser_context)); | 231 web_ui, EasyUnlockServiceFactory::GetForBrowserContext(browser_context) |
| 232 ->proximity_auth_client()); |
| 232 } | 233 } |
| 233 #endif | 234 #endif |
| 234 | 235 |
| 235 // Special cases for DOM distiller. | 236 // Special cases for DOM distiller. |
| 236 template<> | 237 template<> |
| 237 WebUIController* NewWebUI<dom_distiller::DomDistillerUi>(WebUI* web_ui, | 238 WebUIController* NewWebUI<dom_distiller::DomDistillerUi>(WebUI* web_ui, |
| 238 const GURL& url) { | 239 const GURL& url) { |
| 239 // The DomDistillerUi can not depend on components/dom_distiller/content, | 240 // The DomDistillerUi can not depend on components/dom_distiller/content, |
| 240 // so inject the correct DomDistillerService from chrome/. | 241 // so inject the correct DomDistillerService from chrome/. |
| 241 content::BrowserContext* browser_context = | 242 content::BrowserContext* browser_context = |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 #endif | 764 #endif |
| 764 | 765 |
| 765 // Android doesn't use the plugins pages. | 766 // Android doesn't use the plugins pages. |
| 766 if (page_url.host() == chrome::kChromeUIPluginsHost) | 767 if (page_url.host() == chrome::kChromeUIPluginsHost) |
| 767 return PluginsUI::GetFaviconResourceBytes(scale_factor); | 768 return PluginsUI::GetFaviconResourceBytes(scale_factor); |
| 768 | 769 |
| 769 #endif | 770 #endif |
| 770 | 771 |
| 771 return NULL; | 772 return NULL; |
| 772 } | 773 } |
| OLD | NEW |