| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 } | 649 } |
| 650 | 650 |
| 651 return NULL; | 651 return NULL; |
| 652 } | 652 } |
| 653 | 653 |
| 654 void RunFaviconCallbackAsync( | 654 void RunFaviconCallbackAsync( |
| 655 const favicon_base::FaviconResultsCallback& callback, | 655 const favicon_base::FaviconResultsCallback& callback, |
| 656 const std::vector<favicon_base::FaviconRawBitmapResult>* results) { | 656 const std::vector<favicon_base::FaviconRawBitmapResult>* results) { |
| 657 base::ThreadTaskRunnerHandle::Get()->PostTask( | 657 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 658 FROM_HERE, | 658 FROM_HERE, |
| 659 base::Bind(&favicon::FaviconService::FaviconResultsCallbackRunner, | 659 base::BindOnce(&favicon::FaviconService::FaviconResultsCallbackRunner, |
| 660 callback, base::Owned(results))); | 660 callback, base::Owned(results))); |
| 661 } | 661 } |
| 662 | 662 |
| 663 } // namespace | 663 } // namespace |
| 664 | 664 |
| 665 WebUI::TypeID ChromeWebUIControllerFactory::GetWebUIType( | 665 WebUI::TypeID ChromeWebUIControllerFactory::GetWebUIType( |
| 666 content::BrowserContext* browser_context, const GURL& url) const { | 666 content::BrowserContext* browser_context, const GURL& url) const { |
| 667 Profile* profile = Profile::FromBrowserContext(browser_context); | 667 Profile* profile = Profile::FromBrowserContext(browser_context); |
| 668 WebUIFactoryFunction function = GetWebUIFactoryFunction(NULL, profile, url); | 668 WebUIFactoryFunction function = GetWebUIFactoryFunction(NULL, profile, url); |
| 669 return function ? reinterpret_cast<WebUI::TypeID>(function) : WebUI::kNoWebUI; | 669 return function ? reinterpret_cast<WebUI::TypeID>(function) : WebUI::kNoWebUI; |
| 670 } | 670 } |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 | 827 |
| 828 #if BUILDFLAG(ENABLE_EXTENSIONS) | 828 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 829 if (page_url.host_piece() == chrome::kChromeUIExtensionsHost || | 829 if (page_url.host_piece() == chrome::kChromeUIExtensionsHost || |
| 830 page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost) | 830 page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost) |
| 831 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor); | 831 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor); |
| 832 #endif // BUILDFLAG(ENABLE_EXTENSIONS) | 832 #endif // BUILDFLAG(ENABLE_EXTENSIONS) |
| 833 #endif // !defined(OS_ANDROID) | 833 #endif // !defined(OS_ANDROID) |
| 834 | 834 |
| 835 return NULL; | 835 return NULL; |
| 836 } | 836 } |
| OLD | NEW |