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

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

Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review feedback Created 5 years, 2 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
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 <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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 // handled by a remote devtools on the host machine, and other elements, i.e. 503 // handled by a remote devtools on the host machine, and other elements, i.e.
504 // extensions aren't supported. 504 // extensions aren't supported.
505 if (url.host() == chrome::kChromeUIInspectHost) 505 if (url.host() == chrome::kChromeUIInspectHost)
506 return &NewWebUI<InspectUI>; 506 return &NewWebUI<InspectUI>;
507 #endif 507 #endif
508 #if defined(OS_ANDROID) 508 #if defined(OS_ANDROID)
509 if (url.host() == chrome::kChromeUIPopularSitesInternalsHost) 509 if (url.host() == chrome::kChromeUIPopularSitesInternalsHost)
510 return &NewWebUI<PopularSitesInternalsUI>; 510 return &NewWebUI<PopularSitesInternalsUI>;
511 #endif 511 #endif
512 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 512 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
513 if (url.host() == chrome::kChromeUIUserManagerHost && 513 if (url.host() == chrome::kChromeUIUserManagerHost)
514 switches::IsNewAvatarMenu()) {
515 return &NewWebUI<UserManagerUI>; 514 return &NewWebUI<UserManagerUI>;
516 }
517 #endif 515 #endif
518 516
519 /**************************************************************************** 517 /****************************************************************************
520 * Other #defines and special logics. 518 * Other #defines and special logics.
521 ***************************************************************************/ 519 ***************************************************************************/
522 #if !defined(DISABLE_NACL) 520 #if !defined(DISABLE_NACL)
523 if (url.host() == chrome::kChromeUINaClHost) 521 if (url.host() == chrome::kChromeUINaClHost)
524 return &NewWebUI<NaClUI>; 522 return &NewWebUI<NaClUI>;
525 #endif 523 #endif
526 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) 524 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 #endif 785 #endif
788 786
789 // Android doesn't use the plugins pages. 787 // Android doesn't use the plugins pages.
790 if (page_url.host() == chrome::kChromeUIPluginsHost) 788 if (page_url.host() == chrome::kChromeUIPluginsHost)
791 return PluginsUI::GetFaviconResourceBytes(scale_factor); 789 return PluginsUI::GetFaviconResourceBytes(scale_factor);
792 790
793 #endif 791 #endif
794 792
795 return NULL; 793 return NULL;
796 } 794 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698