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

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

Issue 619773002: Remove ToS strings on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « chrome/browser/ui/webui/about_ui.cc ('k') | 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 <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 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 switches::IsNewAvatarMenu()) { 499 switches::IsNewAvatarMenu()) {
500 return &NewWebUI<UserManagerUI>; 500 return &NewWebUI<UserManagerUI>;
501 } 501 }
502 #endif 502 #endif
503 503
504 if (url.host() == chrome::kChromeUIChromeURLsHost || 504 if (url.host() == chrome::kChromeUIChromeURLsHost ||
505 url.host() == chrome::kChromeUICreditsHost || 505 url.host() == chrome::kChromeUICreditsHost ||
506 url.host() == chrome::kChromeUIDNSHost || 506 url.host() == chrome::kChromeUIDNSHost ||
507 url.host() == chrome::kChromeUIMemoryHost || 507 url.host() == chrome::kChromeUIMemoryHost ||
508 url.host() == chrome::kChromeUIMemoryRedirectHost || 508 url.host() == chrome::kChromeUIMemoryRedirectHost ||
509 url.host() == chrome::kChromeUIStatsHost || 509 url.host() == chrome::kChromeUIStatsHost
510 url.host() == chrome::kChromeUITermsHost 510 #if !defined(OS_ANDROID)
511 || url.host() == chrome::kChromeUITermsHost
512 #endif
511 #if defined(OS_LINUX) || defined(OS_OPENBSD) 513 #if defined(OS_LINUX) || defined(OS_OPENBSD)
512 || url.host() == chrome::kChromeUILinuxProxyConfigHost 514 || url.host() == chrome::kChromeUILinuxProxyConfigHost
513 || url.host() == chrome::kChromeUISandboxHost 515 || url.host() == chrome::kChromeUISandboxHost
514 #endif 516 #endif
515 #if defined(OS_CHROMEOS) 517 #if defined(OS_CHROMEOS)
516 || url.host() == chrome::kChromeUIDiscardsHost 518 || url.host() == chrome::kChromeUIDiscardsHost
517 || url.host() == chrome::kChromeUIOSCreditsHost 519 || url.host() == chrome::kChromeUIOSCreditsHost
518 #endif 520 #endif
519 #if defined(WEBUI_TASK_MANAGER) 521 #if defined(WEBUI_TASK_MANAGER)
520 || url.host() == chrome::kChromeUITaskManagerHost 522 || url.host() == chrome::kChromeUITaskManagerHost
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 #endif 725 #endif
724 726
725 // Android doesn't use the plugins pages. 727 // Android doesn't use the plugins pages.
726 if (page_url.host() == chrome::kChromeUIPluginsHost) 728 if (page_url.host() == chrome::kChromeUIPluginsHost)
727 return PluginsUI::GetFaviconResourceBytes(scale_factor); 729 return PluginsUI::GetFaviconResourceBytes(scale_factor);
728 730
729 #endif 731 #endif
730 732
731 return NULL; 733 return NULL;
732 } 734 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/about_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698