Commit 6956efc3 authored by Orin Jaworski's avatar Orin Jaworski Committed by Commit Bot

[omnibox] Change update chrome Pedal to simple navigation

This CL eliminates the override readiness and execution logic to make
the Pedal for updating Chrome rely on the base implementation with
navigation to chrome://settings/help . Other URLs are also updated
to stay in sync with targets agreed upon with PM & UX. Related unit
tests are also eliminated.

Bug: 893183
Change-Id: Iaaf2a02700449932d198331a0856cb7c926c145e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314160Reviewed-by: default avatarmanuk hovanesian <manukh@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791285}
parent 35a4866e
...@@ -82,7 +82,7 @@ class OmniboxPedalUpdateCreditCard : public OmniboxPedal { ...@@ -82,7 +82,7 @@ class OmniboxPedalUpdateCreditCard : public OmniboxPedal {
IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT, IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT,
IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT_SHORT, IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT_SHORT,
IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_SUGGESTION_CONTENTS), IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_SUGGESTION_CONTENTS),
GURL("chrome://settings/autofill")) {} GURL("chrome://settings/payments")) {}
}; };
// ============================================================================= // =============================================================================
...@@ -122,22 +122,15 @@ class OmniboxPedalTranslate : public OmniboxPedal { ...@@ -122,22 +122,15 @@ class OmniboxPedalTranslate : public OmniboxPedal {
// ============================================================================= // =============================================================================
OmniboxPedalUpdateChrome::OmniboxPedalUpdateChrome() class OmniboxPedalUpdateChrome : public OmniboxPedal {
: OmniboxPedal( public:
LabelStrings(IDS_OMNIBOX_PEDAL_UPDATE_CHROME_HINT, OmniboxPedalUpdateChrome()
IDS_OMNIBOX_PEDAL_UPDATE_CHROME_HINT_SHORT, : OmniboxPedal(
IDS_OMNIBOX_PEDAL_UPDATE_CHROME_SUGGESTION_CONTENTS), LabelStrings(IDS_OMNIBOX_PEDAL_UPDATE_CHROME_HINT,
// Fake URL to distinguish matches. IDS_OMNIBOX_PEDAL_UPDATE_CHROME_HINT_SHORT,
GURL("chrome://update/pedals")) {} IDS_OMNIBOX_PEDAL_UPDATE_CHROME_SUGGESTION_CONTENTS),
GURL("chrome://settings/help")) {}
void OmniboxPedalUpdateChrome::Execute(ExecutionContext& context) const { };
context.client_.OpenUpdateChromeDialog();
}
bool OmniboxPedalUpdateChrome::IsReadyToTrigger(
const AutocompleteProviderClient& client) const {
return client.IsBrowserUpdateAvailable();
}
// ============================================================================= // =============================================================================
......
...@@ -20,14 +20,6 @@ class OmniboxPedalClearBrowsingData : public OmniboxPedal { ...@@ -20,14 +20,6 @@ class OmniboxPedalClearBrowsingData : public OmniboxPedal {
#endif #endif
}; };
class OmniboxPedalUpdateChrome : public OmniboxPedal {
public:
OmniboxPedalUpdateChrome();
void Execute(ExecutionContext& context) const override;
bool IsReadyToTrigger(
const AutocompleteProviderClient& client) const override;
};
// Returns the full set of encapsulated OmniboxPedal implementations. // Returns the full set of encapsulated OmniboxPedal implementations.
std::unordered_map<OmniboxPedalId, std::unique_ptr<OmniboxPedal>> std::unordered_map<OmniboxPedalId, std::unique_ptr<OmniboxPedal>>
GetPedalImplementations(); GetPedalImplementations();
......
...@@ -24,26 +24,6 @@ class OmniboxPedalImplementationsTest : public testing::Test { ...@@ -24,26 +24,6 @@ class OmniboxPedalImplementationsTest : public testing::Test {
std::unique_ptr<TestOmniboxEditController> omnibox_edit_controller_; std::unique_ptr<TestOmniboxEditController> omnibox_edit_controller_;
}; };
TEST_F(OmniboxPedalImplementationsTest, ClientReadiesPedalUpdateChrome) {
MockAutocompleteProviderClient client;
const OmniboxPedalUpdateChrome pedal;
EXPECT_EQ(false, pedal.IsReadyToTrigger(client));
client.set_browser_update_available(true);
EXPECT_EQ(true, pedal.IsReadyToTrigger(client));
}
TEST_F(OmniboxPedalImplementationsTest, ProviderFiltersPedalUpdateChrome) {
MockAutocompleteProviderClient client;
OmniboxPedalProvider provider(client);
const base::string16 trigger = base::ASCIIToUTF16("update chrome");
const OmniboxPedal* pedal = provider.FindPedalMatch(trigger);
EXPECT_EQ(pedal, nullptr) << "Pedal not filtered by condition.";
client.set_browser_update_available(true);
pedal = provider.FindPedalMatch(trigger);
EXPECT_NE(pedal, nullptr) << "Pedal not discovered though condition is met.";
EXPECT_TRUE(pedal->IsTriggerMatch(provider.Tokenize(trigger)));
}
TEST_F(OmniboxPedalImplementationsTest, PedalClearBrowsingDataExecutes) { TEST_F(OmniboxPedalImplementationsTest, PedalClearBrowsingDataExecutes) {
MockAutocompleteProviderClient client; MockAutocompleteProviderClient client;
base::TimeTicks match_selection_timestamp; base::TimeTicks match_selection_timestamp;
......
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