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 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
685 | 685 |
686 bitmap_result.pixel_size = candidate_sizes[selected_index]; | 686 bitmap_result.pixel_size = candidate_sizes[selected_index]; |
687 } | 687 } |
688 } | 688 } |
689 | 689 |
690 RunFaviconCallbackAsync(callback, favicon_bitmap_results); | 690 RunFaviconCallbackAsync(callback, favicon_bitmap_results); |
691 } | 691 } |
692 | 692 |
693 // static | 693 // static |
694 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { | 694 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { |
695 return Singleton<ChromeWebUIControllerFactory>::get(); | 695 return base::Singleton<ChromeWebUIControllerFactory>::get(); |
696 } | 696 } |
697 | 697 |
698 ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() { | 698 ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() { |
699 } | 699 } |
700 | 700 |
701 ChromeWebUIControllerFactory::~ChromeWebUIControllerFactory() { | 701 ChromeWebUIControllerFactory::~ChromeWebUIControllerFactory() { |
702 } | 702 } |
703 | 703 |
704 base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( | 704 base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( |
705 const GURL& page_url, ui::ScaleFactor scale_factor) const { | 705 const GURL& page_url, ui::ScaleFactor scale_factor) const { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 #endif | 763 #endif |
764 | 764 |
765 // Android doesn't use the plugins pages. | 765 // Android doesn't use the plugins pages. |
766 if (page_url.host() == chrome::kChromeUIPluginsHost) | 766 if (page_url.host() == chrome::kChromeUIPluginsHost) |
767 return PluginsUI::GetFaviconResourceBytes(scale_factor); | 767 return PluginsUI::GetFaviconResourceBytes(scale_factor); |
768 | 768 |
769 #endif | 769 #endif |
770 | 770 |
771 return NULL; | 771 return NULL; |
772 } | 772 } |
OLD | NEW |