Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 135113002: Undo the mistake of early return in GetFaviconResourceBytes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 NOTREACHED(); 615 NOTREACHED();
616 return NULL; 616 return NULL;
617 } 617 }
618 #endif 618 #endif
619 619
620 if (!content::HasWebUIScheme(page_url)) 620 if (!content::HasWebUIScheme(page_url))
621 return NULL; 621 return NULL;
622 622
623 if (page_url.host() == chrome::kChromeUIComponentsHost) 623 if (page_url.host() == chrome::kChromeUIComponentsHost)
624 return ComponentsUI::GetFaviconResourceBytes(scale_factor); 624 return ComponentsUI::GetFaviconResourceBytes(scale_factor);
625 return NULL;
626 625
627 #if defined(OS_WIN) 626 #if defined(OS_WIN)
628 if (page_url.host() == chrome::kChromeUIConflictsHost) 627 if (page_url.host() == chrome::kChromeUIConflictsHost)
629 return ConflictsUI::GetFaviconResourceBytes(scale_factor); 628 return ConflictsUI::GetFaviconResourceBytes(scale_factor);
630 #endif 629 #endif
631 630
632 if (page_url.host() == chrome::kChromeUICrashesHost) 631 if (page_url.host() == chrome::kChromeUICrashesHost)
633 return CrashesUI::GetFaviconResourceBytes(scale_factor); 632 return CrashesUI::GetFaviconResourceBytes(scale_factor);
634 633
635 if (page_url.host() == chrome::kChromeUIFlagsHost) 634 if (page_url.host() == chrome::kChromeUIFlagsHost)
(...skipping 24 matching lines...) Expand all
660 if (page_url.host() == chrome::kChromeUIExtensionsHost || 659 if (page_url.host() == chrome::kChromeUIExtensionsHost ||
661 page_url.host() == chrome::kChromeUIExtensionsFrameHost) 660 page_url.host() == chrome::kChromeUIExtensionsFrameHost)
662 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor); 661 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor);
663 #endif 662 #endif
664 663
665 // Android doesn't use the plugins pages. 664 // Android doesn't use the plugins pages.
666 if (page_url.host() == chrome::kChromeUIPluginsHost) 665 if (page_url.host() == chrome::kChromeUIPluginsHost)
667 return PluginsUI::GetFaviconResourceBytes(scale_factor); 666 return PluginsUI::GetFaviconResourceBytes(scale_factor);
668 667
669 #endif 668 #endif
669
670 return NULL;
670 } 671 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698