Skip to content

GitLab

T
tangled
Commit e432750b authored by mariakhomenko@chromium.org's avatar mariakhomenko@chromium.org
Browse files
Options

Remove built-in pages that don't work on Android from suggest. 

Also gets rid of Android dependency on quota-internals, which doesn't
work on Android.

BUG=373943

Review URL: https://codereview.chromium.org/285233007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271171 0039d316-1c4b-4281-b951-d872f2087c98
parent 2705e490
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 32 deletions
chrome/browser/autocomplete/builtin_provider.cc
View file @ e432750b
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
namespace { namespace {
#if !defined(OS_ANDROID)
// This list should be kept in sync with chrome/common/url_constants.h. // This list should be kept in sync with chrome/common/url_constants.h.
// Only include useful sub-pages, confirmation alerts are not useful. // Only include useful sub-pages, confirmation alerts are not useful.
const char* const kChromeSettingsSubPages[] = { const char* const kChromeSettingsSubPages[] = {
...@@ -32,6 +33,7 @@ const char* const kChromeSettingsSubPages[] = { ...@@ -32,6 +33,7 @@ const char* const kChromeSettingsSubPages[] = {
chrome::kInternetOptionsSubPage, chrome::kInternetOptionsSubPage,
#endif #endif
}; };
#endif // !defined(OS_ANDROID)
} // namespace } // namespace
...@@ -48,12 +50,15 @@ BuiltinProvider::BuiltinProvider(AutocompleteProviderListener* listener, ...@@ -48,12 +50,15 @@ BuiltinProvider::BuiltinProvider(AutocompleteProviderListener* listener,
for (std::vector<std::string>::iterator i(builtins.begin()); for (std::vector<std::string>::iterator i(builtins.begin());
i != builtins.end(); ++i) i != builtins.end(); ++i)
builtins_.push_back(base::ASCIIToUTF16(*i)); builtins_.push_back(base::ASCIIToUTF16(*i));
#if !defined(OS_ANDROID)
base::string16 settings(base::ASCIIToUTF16(chrome::kChromeUISettingsHost) + base::string16 settings(base::ASCIIToUTF16(chrome::kChromeUISettingsHost) +
base::ASCIIToUTF16("/")); base::ASCIIToUTF16("/"));
for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) { for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) {
builtins_.push_back( builtins_.push_back(
settings + base::ASCIIToUTF16(kChromeSettingsSubPages[i])); settings + base::ASCIIToUTF16(kChromeSettingsSubPages[i]));
} }
#endif
} }
void BuiltinProvider::Start(const AutocompleteInput& input, void BuiltinProvider::Start(const AutocompleteInput& input,
...@@ -87,8 +92,10 @@ void BuiltinProvider::Start(const AutocompleteInput& input, ...@@ -87,8 +92,10 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
// Include some common builtin chrome URLs as the user types the scheme. // Include some common builtin chrome URLs as the user types the scheme.
AddMatch(base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL), AddMatch(base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL),
base::string16(), styles); base::string16(), styles);
#if !defined(OS_ANDROID)
AddMatch(base::ASCIIToUTF16(chrome::kChromeUISettingsURL), AddMatch(base::ASCIIToUTF16(chrome::kChromeUISettingsURL),
base::string16(), styles); base::string16(), styles);
#endif
AddMatch(base::ASCIIToUTF16(chrome::kChromeUIVersionURL), AddMatch(base::ASCIIToUTF16(chrome::kChromeUIVersionURL),
base::string16(), styles); base::string16(), styles);
} else { } else {
......
chrome/browser/autocomplete/builtin_provider_unittest.cc
View file @ e432750b
...@@ -73,6 +73,7 @@ void BuiltinProviderTest::RunTest(test_data<ResultType>* builtin_cases, ...@@ -73,6 +73,7 @@ void BuiltinProviderTest::RunTest(test_data<ResultType>* builtin_cases,
} }
} }
#if !defined(OS_ANDROID)
TEST_F(BuiltinProviderTest, TypingScheme) { TEST_F(BuiltinProviderTest, TypingScheme) {
const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme); const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme); const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
...@@ -120,6 +121,54 @@ TEST_F(BuiltinProviderTest, TypingScheme) { ...@@ -120,6 +121,54 @@ TEST_F(BuiltinProviderTest, TypingScheme) {
RunTest<GURL>(typing_scheme_cases, arraysize(typing_scheme_cases), RunTest<GURL>(typing_scheme_cases, arraysize(typing_scheme_cases),
&AutocompleteMatch::destination_url); &AutocompleteMatch::destination_url);
} }
#else // Android uses a subset of the URLs
TEST_F(BuiltinProviderTest, TypingScheme) {
const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme);
const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
const base::string16 kSeparator1 = ASCIIToUTF16(":");
const base::string16 kSeparator2 = ASCIIToUTF16(":/");
const base::string16 kSeparator3 =
ASCIIToUTF16(content::kStandardSchemeSeparator);
// These default URLs should correspond with those in BuiltinProvider::Start.
const GURL kURL1 = GURL(chrome::kChromeUIChromeURLsURL);
const GURL kURL2 = GURL(chrome::kChromeUIVersionURL);
test_data<GURL> typing_scheme_cases[] = {
// Typing an unrelated scheme should give nothing.
{ASCIIToUTF16("h"), 0, {}},
{ASCIIToUTF16("http"), 0, {}},
{ASCIIToUTF16("file"), 0, {}},
{ASCIIToUTF16("abouz"), 0, {}},
{ASCIIToUTF16("aboutt"), 0, {}},
{ASCIIToUTF16("aboutt:"), 0, {}},
{ASCIIToUTF16("chroma"), 0, {}},
{ASCIIToUTF16("chromee"), 0, {}},
{ASCIIToUTF16("chromee:"), 0, {}},
// Typing a portion of about:// should give the default urls.
{kAbout.substr(0, 1), 2, {kURL1, kURL2}},
{ASCIIToUTF16("A"), 2, {kURL1, kURL2}},
{kAbout, 2, {kURL1, kURL2}},
{kAbout + kSeparator1, 2, {kURL1, kURL2}},
{kAbout + kSeparator2, 2, {kURL1, kURL2}},
{kAbout + kSeparator3, 2, {kURL1, kURL2}},
{ASCIIToUTF16("aBoUT://"), 2, {kURL1, kURL2}},
// Typing a portion of chrome:// should give the default urls.
{kChrome.substr(0, 1), 2, {kURL1, kURL2}},
{ASCIIToUTF16("C"), 2, {kURL1, kURL2}},
{kChrome, 2, {kURL1, kURL2}},
{kChrome + kSeparator1, 2, {kURL1, kURL2}},
{kChrome + kSeparator2, 2, {kURL1, kURL2}},
{kChrome + kSeparator3, 2, {kURL1, kURL2}},
{ASCIIToUTF16("ChRoMe://"), 2, {kURL1, kURL2}},
};
RunTest<GURL>(typing_scheme_cases, arraysize(typing_scheme_cases),
&AutocompleteMatch::destination_url);
}
#endif
TEST_F(BuiltinProviderTest, NonChromeURLs) { TEST_F(BuiltinProviderTest, NonChromeURLs) {
test_data<GURL> non_chrome_url_cases[] = { test_data<GURL> non_chrome_url_cases[] = {
......
chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
View file @ e432750b
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include "chrome/browser/ui/webui/plugins_ui.h" #include "chrome/browser/ui/webui/plugins_ui.h"
#include "chrome/browser/ui/webui/predictors/predictors_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
#include "chrome/browser/ui/webui/profiler_ui.h" #include "chrome/browser/ui/webui/profiler_ui.h"
#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
#include "chrome/browser/ui/webui/signin/inline_login_ui.h" #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
#include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h" #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"
#include "chrome/browser/ui/webui/signin/user_manager_ui.h" #include "chrome/browser/ui/webui/signin/user_manager_ui.h"
...@@ -96,6 +95,7 @@ ...@@ -96,6 +95,7 @@
#include "chrome/browser/ui/webui/welcome_ui_android.h" #include "chrome/browser/ui/webui/welcome_ui_android.h"
#else #else
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
#include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui.h" #include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui.h"
#include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h" #include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h"
#include "chrome/browser/ui/webui/system_info_ui.h" #include "chrome/browser/ui/webui/system_info_ui.h"
...@@ -303,8 +303,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, ...@@ -303,8 +303,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<PredictorsUI>; return &NewWebUI<PredictorsUI>;
if (url.host() == chrome::kChromeUIProfilerHost) if (url.host() == chrome::kChromeUIProfilerHost)
return &NewWebUI<ProfilerUI>; return &NewWebUI<ProfilerUI>;
if (url.host() == chrome::kChromeUIQuotaInternalsHost)
return &NewWebUI<QuotaInternalsUI>;
if (url.host() == chrome::kChromeUISignInInternalsHost) if (url.host() == chrome::kChromeUISignInInternalsHost)
return &NewWebUI<SignInInternalsUI>; return &NewWebUI<SignInInternalsUI>;
if (url.host() == chrome::kChromeUISyncInternalsHost) if (url.host() == chrome::kChromeUISyncInternalsHost)
...@@ -369,6 +367,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, ...@@ -369,6 +367,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
// Android does not support plugins for now. // Android does not support plugins for now.
if (url.host() == chrome::kChromeUIPluginsHost) if (url.host() == chrome::kChromeUIPluginsHost)
return &NewWebUI<PluginsUI>; return &NewWebUI<PluginsUI>;
if (url.host() == chrome::kChromeUIQuotaInternalsHost)
return &NewWebUI<QuotaInternalsUI>;
// Settings are implemented with native UI elements on Android. // Settings are implemented with native UI elements on Android.
if (url.host() == chrome::kChromeUISettingsFrameHost) if (url.host() == chrome::kChromeUISettingsFrameHost)
return &NewWebUI<options::OptionsUI>; return &NewWebUI<options::OptionsUI>;
......
chrome/chrome_browser_ui.gypi
View file @ e432750b
...@@ -2923,6 +2923,7 @@ ...@@ -2923,6 +2923,7 @@
['exclude', '^browser/ui/webui/ntp'], ['exclude', '^browser/ui/webui/ntp'],
['exclude', '^browser/ui/webui/options'], ['exclude', '^browser/ui/webui/options'],
['exclude', '^browser/ui/webui/options'], ['exclude', '^browser/ui/webui/options'],
['exclude', '^browser/ui/webui/quota_internals'],
['exclude', '^browser/ui/webui/signin/'], ['exclude', '^browser/ui/webui/signin/'],
['exclude', '^browser/ui/webui/suggestions_internals'], ['exclude', '^browser/ui/webui/suggestions_internals'],
['exclude', '^browser/ui/webui/sync_file_system_internals'], ['exclude', '^browser/ui/webui/sync_file_system_internals'],
......
chrome/common/url_constants.cc
View file @ e432750b
...@@ -565,36 +565,35 @@ const char* const kChromeHostURLs[] = { ...@@ -565,36 +565,35 @@ const char* const kChromeHostURLs[] = {
kChromeUIComponentsHost, kChromeUIComponentsHost,
kChromeUICrashesHost, kChromeUICrashesHost,
kChromeUICreditsHost, kChromeUICreditsHost,
#if defined(ENABLE_SERVICE_DISCOVERY)
kChromeUIDevicesHost,
#endif
kChromeUIDNSHost, kChromeUIDNSHost,
kChromeUIFlagsHost, kChromeUIFlagsHost,
kChromeUIGCMInternalsHost,
kChromeUIHelpHost,
kChromeUIHistoryHost, kChromeUIHistoryHost,
kChromeUIInvalidationsHost, kChromeUIInvalidationsHost,
kChromeUIIPCHost,
kChromeUIMemoryHost, kChromeUIMemoryHost,
kChromeUIMemoryInternalsHost, kChromeUIMemoryInternalsHost,
#if defined(OS_ANDROID) || defined(OS_IOS)
kChromeUINetExportHost,
#endif
kChromeUINetInternalsHost, kChromeUINetInternalsHost,
kChromeUINewTabHost, kChromeUINewTabHost,
kChromeUIOmniboxHost, kChromeUIOmniboxHost,
kChromeUIPredictorsHost, kChromeUIPredictorsHost,
kChromeUIProfilerHost, kChromeUIProfilerHost,
kChromeUIQuotaInternalsHost,
kChromeUISignInInternalsHost, kChromeUISignInInternalsHost,
kChromeUIStatsHost, kChromeUIStatsHost,
kChromeUISyncInternalsHost, kChromeUISyncInternalsHost,
kChromeUISystemInfoHost,
kChromeUITermsHost, kChromeUITermsHost,
kChromeUITranslateInternalsHost, kChromeUITranslateInternalsHost,
kChromeUIUberHost,
kChromeUIUserActionsHost, kChromeUIUserActionsHost,
kChromeUIVersionHost, kChromeUIVersionHost,
content::kChromeUIAccessibilityHost,
content::kChromeUIAppCacheInternalsHost,
content::kChromeUIBlobInternalsHost,
content::kChromeUIGpuHost,
content::kChromeUIHistogramHost,
content::kChromeUIIndexedDBInternalsHost,
content::kChromeUIMediaInternalsHost,
content::kChromeUINetworkViewCacheHost,
content::kChromeUIServiceWorkerInternalsHost,
content::kChromeUITracingHost,
content::kChromeUIWebRTCInternalsHost,
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
kChromeUIWelcomeHost, kChromeUIWelcomeHost,
#else #else
...@@ -602,16 +601,18 @@ const char* const kChromeHostURLs[] = { ...@@ -602,16 +601,18 @@ const char* const kChromeHostURLs[] = {
kChromeUIBookmarksHost, kChromeUIBookmarksHost,
kChromeUIDownloadsHost, kChromeUIDownloadsHost,
kChromeUIFlashHost, kChromeUIFlashHost,
kChromeUIGCMInternalsHost,
kChromeUIHelpHost,
kChromeUIInspectHost, kChromeUIInspectHost,
kChromeUIIPCHost,
kChromeUIPluginsHost, kChromeUIPluginsHost,
kChromeUIQuotaInternalsHost,
kChromeUISettingsHost, kChromeUISettingsHost,
kChromeUISystemInfoHost,
kChromeUIUberHost,
#endif #endif
#if defined(OS_WIN) #if defined(OS_ANDROID) || defined(OS_IOS)
kChromeUIConflictsHost, kChromeUINetExportHost,
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
kChromeUILinuxProxyConfigHost,
kChromeUISandboxHost,
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
kChromeUICertificateManagerHost, kChromeUICertificateManagerHost,
...@@ -630,6 +631,13 @@ const char* const kChromeHostURLs[] = { ...@@ -630,6 +631,13 @@ const char* const kChromeHostURLs[] = {
kChromeUIProxySettingsHost, kChromeUIProxySettingsHost,
kChromeUITaskManagerHost, kChromeUITaskManagerHost,
#endif #endif
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
kChromeUILinuxProxyConfigHost,
kChromeUISandboxHost,
#endif
#if defined(OS_WIN)
kChromeUIConflictsHost,
#endif
#if !defined(DISABLE_NACL) #if !defined(DISABLE_NACL)
kChromeUINaClHost, kChromeUINaClHost,
#endif #endif
...@@ -642,17 +650,9 @@ const char* const kChromeHostURLs[] = { ...@@ -642,17 +650,9 @@ const char* const kChromeHostURLs[] = {
#if defined(ENABLE_FULL_PRINTING) #if defined(ENABLE_FULL_PRINTING)
kChromeUIPrintHost, kChromeUIPrintHost,
#endif #endif
content::kChromeUIAccessibilityHost, #if defined(ENABLE_SERVICE_DISCOVERY)
content::kChromeUIAppCacheInternalsHost, kChromeUIDevicesHost,
content::kChromeUIBlobInternalsHost, #endif
content::kChromeUIGpuHost,
content::kChromeUIHistogramHost,
content::kChromeUIIndexedDBInternalsHost,
content::kChromeUIMediaInternalsHost,
content::kChromeUINetworkViewCacheHost,
content::kChromeUIServiceWorkerInternalsHost,
content::kChromeUITracingHost,
content::kChromeUIWebRTCInternalsHost,
#if defined(ENABLE_WEBRTC) #if defined(ENABLE_WEBRTC)
kChromeUIWebRtcLogsHost, kChromeUIWebRtcLogsHost,
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment