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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/protector/mock_setting_change.cc

Issue 9968007: [protector] Support for collapsing multiple changes into a single one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tried to compile after merge. Created 8 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/protector/default_search_provider_change.cc ('K') | « chrome/browser/protector/mock_setting_change.h ('k') | chrome/browser/protector/prefs_backup_invalid_change.cc » ('j') | chrome/browser/protector/protector_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/protector/mock_setting_change.cc
diff --git a/chrome/browser/protector/mock_setting_change.cc b/chrome/browser/protector/mock_setting_change.cc
index 53bc9f3e7449ca0d096ec5a31663018670a60bfb..2fcd9e13fed280ec35a41dbcd6eb152cdba3e11f 100644
--- a/chrome/browser/protector/mock_setting_change.cc
+++ b/chrome/browser/protector/mock_setting_change.cc
@@ -25,6 +25,12 @@ MockSettingChange::MockSettingChange() {
WillByDefault(Return(UTF8ToUTF16("Apply")));
ON_CALL(*this, GetDiscardButtonText()).
WillByDefault(Return(UTF8ToUTF16("Discard")));
+
+ ON_CALL(*this, GetApplyDisplayName()).
+ WillByDefault(Return(
+ DisplayName(kDefaultNamePriority, UTF8ToUTF16("new settings"))));
+ ON_CALL(*this, GetApplyKeyword()).
+ WillByDefault(Return(std::string()));
}
MockSettingChange::~MockSettingChange() {
« chrome/browser/protector/default_search_provider_change.cc ('K') | « chrome/browser/protector/mock_setting_change.h ('k') | chrome/browser/protector/prefs_backup_invalid_change.cc » ('j') | chrome/browser/protector/protector_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698