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

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

Issue 10828140: Upstream about:welcome page for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
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/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/about_flags.h" 8 #include "chrome/browser/about_flags.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_web_ui.h" 10 #include "chrome/browser/extensions/extension_web_ui.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 } 334 }
335 #endif 335 #endif
336 336
337 if (url.host() == chrome::kChromeUIChromeURLsHost || 337 if (url.host() == chrome::kChromeUIChromeURLsHost ||
338 url.host() == chrome::kChromeUICreditsHost || 338 url.host() == chrome::kChromeUICreditsHost ||
339 url.host() == chrome::kChromeUIDNSHost || 339 url.host() == chrome::kChromeUIDNSHost ||
340 url.host() == chrome::kChromeUIMemoryHost || 340 url.host() == chrome::kChromeUIMemoryHost ||
341 url.host() == chrome::kChromeUIMemoryRedirectHost || 341 url.host() == chrome::kChromeUIMemoryRedirectHost ||
342 url.host() == chrome::kChromeUIStatsHost || 342 url.host() == chrome::kChromeUIStatsHost ||
343 url.host() == chrome::kChromeUITermsHost || 343 url.host() == chrome::kChromeUITermsHost ||
344 #if defined(OS_ANDROID)
345 url.host() == chrome::kChromeUIWelcomeHost ||
346 #endif
344 url.host() == chrome::kChromeUIVersionHost 347 url.host() == chrome::kChromeUIVersionHost
345 #if defined(OS_LINUX) || defined(OS_OPENBSD) 348 #if defined(OS_LINUX) || defined(OS_OPENBSD)
346 || url.host() == chrome::kChromeUILinuxProxyConfigHost 349 || url.host() == chrome::kChromeUILinuxProxyConfigHost
347 || url.host() == chrome::kChromeUISandboxHost 350 || url.host() == chrome::kChromeUISandboxHost
348 #endif 351 #endif
349 #if defined(OS_CHROMEOS) 352 #if defined(OS_CHROMEOS)
350 || url.host() == chrome::kChromeUIDiscardsHost 353 || url.host() == chrome::kChromeUIDiscardsHost
351 || url.host() == chrome::kChromeUINetworkHost 354 || url.host() == chrome::kChromeUINetworkHost
352 || url.host() == chrome::kChromeUIOSCreditsHost 355 || url.host() == chrome::kChromeUIOSCreditsHost
353 || url.host() == chrome::kChromeUITransparencyHost 356 || url.host() == chrome::kChromeUITransparencyHost
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 530 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
528 return options2::OptionsUI::GetFaviconResourceBytes(); 531 return options2::OptionsUI::GetFaviconResourceBytes();
529 532
530 // Android doesn't use the plugins pages. 533 // Android doesn't use the plugins pages.
531 if (page_url.host() == chrome::kChromeUIPluginsHost) 534 if (page_url.host() == chrome::kChromeUIPluginsHost)
532 return PluginsUI::GetFaviconResourceBytes(); 535 return PluginsUI::GetFaviconResourceBytes();
533 #endif 536 #endif
534 537
535 return NULL; 538 return NULL;
536 } 539 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698