diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-27 19:20:18 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-27 19:20:18 +0000 |
commit | 4f3b44679a442a13d949ca2deea1bc15612e8db0 (patch) | |
tree | 467728ace4aace084d1da233b7023b9e28487032 /chrome/browser/browser_about_handler.cc | |
parent | c7007d8241c86117f650361929c6887fd57522c4 (diff) | |
download | chromium_src-4f3b44679a442a13d949ca2deea1bc15612e8db0.zip chromium_src-4f3b44679a442a13d949ca2deea1bc15612e8db0.tar.gz chromium_src-4f3b44679a442a13d949ca2deea1bc15612e8db0.tar.bz2 |
importer: Allow chrome to import internal chrome pages (i.e, chrome:// and about: urls).
Bookmark Manager allow users to import and export bookmarks to a html file,
while it allow the users to export bookmarks like about:blank, chrome://version,
it doesn't allow to import such bookmarks. This patch changes that behavior
allowing the "Import Bookmarks from HTML File" process to import bookmarks
with schemes like about: and chrome://.
BUG=223528
TEST=bookmark some internal chrome pages (ones that start with chrome://* or about:*).
Export then to html file through Bookmark Manager. Now import that html file,
all the entries should be imported correctly.
TBR=dbeam@chromium.org, isherman@chromium.org, pkasting@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/19461003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r-- | chrome/browser/browser_about_handler.cc | 100 |
1 files changed, 1 insertions, 99 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 877dfbf..4471269 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -12,104 +12,11 @@ #include "base/memory/singleton.h" #include "base/strings/string_util.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/url_constants.h" -namespace { - -// Add paths here to be included in chrome://chrome-urls (about:about). -// These paths will also be suggested by BuiltinProvider. -const char* const kPaths[] = { - chrome::kChromeUICacheHost, - chrome::kChromeUIChromeURLsHost, - chrome::kChromeUICrashesHost, - chrome::kChromeUICreditsHost, - chrome::kChromeUIDNSHost, - chrome::kChromeUIFlagsHost, - chrome::kChromeUIHistoryHost, - chrome::kChromeUIIPCHost, - chrome::kChromeUIMemoryHost, - chrome::kChromeUIMemoryInternalsHost, -#if defined(OS_ANDROID) || defined(OS_IOS) - chrome::kChromeUINetExportHost, -#endif - chrome::kChromeUINetInternalsHost, - chrome::kChromeUINewTabHost, - chrome::kChromeUIOmniboxHost, - chrome::kChromeUIPredictorsHost, - chrome::kChromeUIProfilerHost, - chrome::kChromeUIQuotaInternalsHost, - chrome::kChromeUISignInInternalsHost, - chrome::kChromeUIStatsHost, - chrome::kChromeUISyncInternalsHost, - chrome::kChromeUITermsHost, - chrome::kChromeUITranslateInternalsHost, - chrome::kChromeUIUserActionsHost, - chrome::kChromeUIVersionHost, -#if defined(OS_ANDROID) - chrome::kChromeUIWelcomeHost, -#else - chrome::kChromeUIBookmarksHost, - chrome::kChromeUIDownloadsHost, - chrome::kChromeUIFlashHost, - chrome::kChromeUIInspectHost, - chrome::kChromeUIPluginsHost, - chrome::kChromeUISettingsHost, -#endif -#if defined(OS_WIN) - chrome::kChromeUIConflictsHost, -#endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) - chrome::kChromeUILinuxProxyConfigHost, - chrome::kChromeUISandboxHost, -#endif -#if defined(OS_CHROMEOS) - chrome::kChromeUIChooseMobileNetworkHost, - chrome::kChromeUICryptohomeHost, - chrome::kChromeUIDiagnosticsHost, - chrome::kChromeUIDiscardsHost, - chrome::kChromeUIDriveInternalsHost, - chrome::kChromeUIImageBurnerHost, - chrome::kChromeUIKeyboardOverlayHost, - chrome::kChromeUILoginHost, - chrome::kChromeUINetworkHost, - chrome::kChromeUIOobeHost, - chrome::kChromeUIOSCreditsHost, - chrome::kChromeUIProxySettingsHost, - chrome::kChromeUISystemInfoHost, - chrome::kChromeUITaskManagerHost, -#endif -#if !defined(DISABLE_NACL) - chrome::kChromeUINaClHost, -#endif -#if defined(ENABLE_CONFIGURATION_POLICY) - chrome::kChromeUIPolicyHost, -#endif -#if defined(ENABLE_EXTENSIONS) - chrome::kChromeUIExtensionsHost, -#endif -#if defined(ENABLE_PRINTING) - chrome::kChromeUIPrintHost, -#endif - content::kChromeUIAccessibilityHost, - content::kChromeUIAppCacheInternalsHost, - content::kChromeUIBlobInternalsHost, - content::kChromeUIGpuHost, - content::kChromeUIHistogramHost, - content::kChromeUIIndexedDBInternalsHost, - content::kChromeUIMediaInternalsHost, - content::kChromeUINetworkViewCacheHost, - content::kChromeUITracingHost, - content::kChromeUIWebRTCInternalsHost, -#if defined(ENABLE_WEBRTC) - chrome::kChromeUIWebRtcLogsHost, -#endif -}; - -} // namespace - bool WillHandleBrowserAboutURL(GURL* url, content::BrowserContext* browser_context) { // TODO(msw): Eliminate "about:*" constants and literals from code and tests, @@ -197,8 +104,3 @@ bool HandleNonNavigationAboutURL(const GURL& url) { return false; } -std::vector<std::string> ChromePaths() { - std::vector<std::string> paths(kPaths, kPaths + arraysize(kPaths)); - std::sort(paths.begin(), paths.end()); - return paths; -} |