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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 205983005: [Android] Rewrite old-style NTP URLs to new-style URLs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: register chrome-native as standard scheme, add back recent_tabs handling Created 6 years, 8 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 | « chrome/chrome_browser.gypi ('k') | chrome/common/url_constants.h » ('j') | 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h" 8 #include "base/cpu.h"
9 #include "base/debug/crash_logging.h" 9 #include "base/debug/crash_logging.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 content::PepperPluginInfo plugin; 472 content::PepperPluginInfo plugin;
473 if (GetBundledPepperFlash(&plugin)) 473 if (GetBundledPepperFlash(&plugin))
474 plugins->push_back(plugin); 474 plugins->push_back(plugin);
475 } 475 }
476 476
477 void ChromeContentClient::AddAdditionalSchemes( 477 void ChromeContentClient::AddAdditionalSchemes(
478 std::vector<std::string>* standard_schemes, 478 std::vector<std::string>* standard_schemes,
479 std::vector<std::string>* savable_schemes) { 479 std::vector<std::string>* savable_schemes) {
480 standard_schemes->push_back(extensions::kExtensionScheme); 480 standard_schemes->push_back(extensions::kExtensionScheme);
481 savable_schemes->push_back(extensions::kExtensionScheme); 481 savable_schemes->push_back(extensions::kExtensionScheme);
482 standard_schemes->push_back(chrome::kChromeNativeScheme);
483 savable_schemes->push_back(chrome::kChromeNativeScheme);
jam 2014/03/27 22:54:19 is this really savable?
newt (away) 2014/03/28 17:54:44 Nope.
482 standard_schemes->push_back(extensions::kExtensionResourceScheme); 484 standard_schemes->push_back(extensions::kExtensionResourceScheme);
483 savable_schemes->push_back(extensions::kExtensionResourceScheme); 485 savable_schemes->push_back(extensions::kExtensionResourceScheme);
484 standard_schemes->push_back(chrome::kChromeSearchScheme); 486 standard_schemes->push_back(chrome::kChromeSearchScheme);
485 savable_schemes->push_back(chrome::kChromeSearchScheme); 487 savable_schemes->push_back(chrome::kChromeSearchScheme);
486 standard_schemes->push_back(chrome::kDomDistillerScheme); 488 standard_schemes->push_back(chrome::kDomDistillerScheme);
487 savable_schemes->push_back(chrome::kDomDistillerScheme); 489 savable_schemes->push_back(chrome::kDomDistillerScheme);
488 #if defined(OS_CHROMEOS) 490 #if defined(OS_CHROMEOS)
489 standard_schemes->push_back(chrome::kCrosScheme); 491 standard_schemes->push_back(chrome::kCrosScheme);
490 #endif 492 #endif
491 } 493 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 549 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
548 return true; 550 return true;
549 } 551 }
550 return false; 552 return false;
551 } 553 }
552 554
553 std::string ChromeContentClient::GetCarbonInterposePath() const { 555 std::string ChromeContentClient::GetCarbonInterposePath() const {
554 return std::string(kInterposeLibraryPath); 556 return std::string(kInterposeLibraryPath);
555 } 557 }
556 #endif 558 #endif
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698