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

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: Revert FRAME_AVATAR_BUTTON changes. 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 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 if (url.host() == chrome::kChromeUIWebRTCDeviceProviderHost) 492 if (url.host() == chrome::kChromeUIWebRTCDeviceProviderHost)
493 return &NewWebUI<WebRTCDeviceProvider::WebUI>; 493 return &NewWebUI<WebRTCDeviceProvider::WebUI>;
494 494
495 // chrome://inspect isn't supported on Android nor iOS. Page debugging is 495 // chrome://inspect isn't supported on Android nor iOS. Page debugging is
496 // handled by a remote devtools on the host machine, and other elements, i.e. 496 // handled by a remote devtools on the host machine, and other elements, i.e.
497 // extensions aren't supported. 497 // extensions aren't supported.
498 if (url.host() == chrome::kChromeUIInspectHost) 498 if (url.host() == chrome::kChromeUIInspectHost)
499 return &NewWebUI<InspectUI>; 499 return &NewWebUI<InspectUI>;
500 #endif 500 #endif
501 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 501 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
502 if (url.host() == chrome::kChromeUIUserManagerHost && 502 if (url.host() == chrome::kChromeUIUserManagerHost) {
Evan Stade 2015/09/25 22:49:10 nit no curlies
anthonyvd 2015/09/29 20:23:16 Done.
503 switches::IsNewAvatarMenu()) {
504 return &NewWebUI<UserManagerUI>; 503 return &NewWebUI<UserManagerUI>;
505 } 504 }
506 #endif 505 #endif
507 506
508 /**************************************************************************** 507 /****************************************************************************
509 * Other #defines and special logics. 508 * Other #defines and special logics.
510 ***************************************************************************/ 509 ***************************************************************************/
511 #if !defined(DISABLE_NACL) 510 #if !defined(DISABLE_NACL)
512 if (url.host() == chrome::kChromeUINaClHost) 511 if (url.host() == chrome::kChromeUINaClHost)
513 return &NewWebUI<NaClUI>; 512 return &NewWebUI<NaClUI>;
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 #endif 767 #endif
769 768
770 // Android doesn't use the plugins pages. 769 // Android doesn't use the plugins pages.
771 if (page_url.host() == chrome::kChromeUIPluginsHost) 770 if (page_url.host() == chrome::kChromeUIPluginsHost)
772 return PluginsUI::GetFaviconResourceBytes(scale_factor); 771 return PluginsUI::GetFaviconResourceBytes(scale_factor);
773 772
774 #endif 773 #endif
775 774
776 return NULL; 775 return NULL;
777 } 776 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698