Skip to content

GitLab

T
tangled
Commit d4da57be authored by tnagel@chromium.org's avatar tnagel@chromium.org
Browse files
Options

Fix 'except' and 'prefer' spelling. 

TBR=marja, stevenjb, yosin
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283419 0039d316-1c4b-4281-b951-d872f2087c98
parent bc8fb53f
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
build/install-chroot.sh
View file @ d4da57be
......@@ -12,7 +12,7 @@
# Older Debian based systems had both "admin" and "adm" groups, with "admin"
# apparently being used in more places. Newer distributions have standardized
# on just the "adm" group. Check /etc/group for the prefered name of the
# on just the "adm" group. Check /etc/group for the preferred name of the
# administrator group.
admin=$(grep '^admin:' /etc/group >&/dev/null && echo admin || echo adm)
......
chrome/browser/chrome_browser_main.cc
View file @ d4da57be
......@@ -897,7 +897,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(macourteau): refactor preferences that are copied from
// master_preferences into local_state, as a "local_state" section in
// master preferences. If possible, a generic solution would be prefered
// master preferences. If possible, a generic solution would be preferred
// over a copy one-by-one of specific preferences. Also see related TODO
// in first_run.h.
......
chrome/browser/content_settings/content_settings_policy_provider.cc
View file @ d4da57be
......@@ -216,13 +216,13 @@ PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) {
prefs::kManagedNotificationsAllowedForUrls, callback);
pref_change_registrar_.Add(
prefs::kManagedNotificationsBlockedForUrls, callback);
// The following preferences are only used to indicate if a
// default content setting is managed and to hold the managed default setting
// value. If the value for any of the following perferences is set then the
// corresponding default content setting is managed. These preferences exist
// in parallel to the preference default content settings. If a
// default content settings type is managed any user defined excpetions
// (patterns) for this type are ignored.
// The following preferences are only used to indicate if a default content
// setting is managed and to hold the managed default setting value. If the
// value for any of the following preferences is set then the corresponding
// default content setting is managed. These preferences exist in parallel to
// the preference default content settings. If a default content settings type
// is managed any user defined exceptions (patterns) for this type are
// ignored.
pref_change_registrar_.Add(prefs::kManagedDefaultCookiesSetting, callback);
pref_change_registrar_.Add(prefs::kManagedDefaultImagesSetting, callback);
pref_change_registrar_.Add(prefs::kManagedDefaultJavaScriptSetting, callback);
......
chrome/browser/history/history_service.h
View file @ d4da57be
......@@ -625,7 +625,7 @@ class HistoryService : public CancelableRequestProvider,
// |icon_types| will be searched and so on.
// If no icon is larger than |minimum_size_in_pixel|, the largest one of all
// icon types in |icon_types| is returned.
// This feature is especially useful when some types of icon is perfered as
// This feature is especially useful when some types of icon is preferred as
// long as its size is larger than a specific value.
base::CancelableTaskTracker::TaskId GetLargestFaviconForURL(
const GURL& page_url,
......
chrome/browser/process_singleton.h
View file @ d4da57be
......@@ -82,8 +82,8 @@ class ProcessSingleton : public base::NonThreadSafe {
// false is returned, we are not the singleton instance and the caller must
// exit.
// NOTE: Most callers should generally prefer NotifyOtherProcessOrCreate() to
// this method, only callers for whom failure is prefered to notifying another
// process should call this directly.
// this method, only callers for whom failure is preferred to notifying
// another process should call this directly.
bool Create();
// Clear any lock state during shutdown.
......
chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
View file @ d4da57be
......@@ -186,7 +186,7 @@ void UserSwichAnimatorChromeOS::TransitionUserShelf(
iter != root_windows.end(); ++iter) {
// This shelf change is only part of the animation and will be updated by
// ChromeLauncherController::ActiveUserChanged() to the new users value.
// Note that the user perference will not be changed.
// Note that the user preference will not be changed.
ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN, *iter);
}
......
chromeos/system/statistics_provider.cc
View file @ d4da57be
......@@ -134,7 +134,7 @@ bool StatisticsProviderImpl::WaitForStatisticsLoaded() {
return true;
// Block if the statistics are not loaded yet. Normally this shouldn't
// happen excpet during OOBE.
// happen except during OOBE.
base::Time start_time = base::Time::Now();
base::ThreadRestrictions::ScopedAllowWait allow_wait;
on_statistics_loaded_.TimedWait(base::TimeDelta::FromSeconds(kTimeoutSecs));
......
components/sync_driver/data_type_manager_impl_unittest.cc
View file @ d4da57be
......@@ -966,7 +966,7 @@ TEST_F(SyncDataTypeManagerImplTest, PrioritizedConfigurationStop) {
FinishDownload(*dtm_, ModelTypeSet(PREFERENCES), ModelTypeSet());
EXPECT_EQ(DataTypeManager::CONFIGURING, dtm_->state());
// PERFERENCES controller is associating while BOOKMARKS is downloading.
// PREFERENCES controller is associating while BOOKMARKS is downloading.
EXPECT_EQ(DataTypeController::ASSOCIATING,
GetController(PREFERENCES)->state());
EXPECT_EQ(DataTypeController::MODEL_LOADED,
......@@ -1001,7 +1001,7 @@ TEST_F(SyncDataTypeManagerImplTest, PrioritizedConfigurationDownloadError) {
FinishDownload(*dtm_, ModelTypeSet(PREFERENCES), ModelTypeSet());
EXPECT_EQ(DataTypeManager::CONFIGURING, dtm_->state());
// PERFERENCES controller is associating while BOOKMARKS is downloading.
// PREFERENCES controller is associating while BOOKMARKS is downloading.
EXPECT_EQ(DataTypeController::ASSOCIATING,
GetController(PREFERENCES)->state());
EXPECT_EQ(DataTypeController::MODEL_LOADED,
......@@ -1037,7 +1037,7 @@ TEST_F(SyncDataTypeManagerImplTest, HighPriorityAssociationFailure) {
FinishDownload(*dtm_, ModelTypeSet(PREFERENCES), ModelTypeSet());
EXPECT_EQ(DataTypeManager::CONFIGURING, dtm_->state());
// PERFERENCES controller is associating while BOOKMARKS is downloading.
// PREFERENCES controller is associating while BOOKMARKS is downloading.
EXPECT_EQ(DataTypeController::ASSOCIATING,
GetController(PREFERENCES)->state());
EXPECT_EQ(DataTypeController::MODEL_LOADED,
......@@ -1089,7 +1089,7 @@ TEST_F(SyncDataTypeManagerImplTest, LowPriorityAssociationFailure) {
FinishDownload(*dtm_, ModelTypeSet(PREFERENCES), ModelTypeSet());
EXPECT_EQ(DataTypeManager::CONFIGURING, dtm_->state());
// PERFERENCES controller is associating while BOOKMARKS is downloading.
// PREFERENCES controller is associating while BOOKMARKS is downloading.
EXPECT_EQ(DataTypeController::ASSOCIATING,
GetController(PREFERENCES)->state());
EXPECT_EQ(DataTypeController::MODEL_LOADED,
......
content/browser/appcache/appcache_storage_impl_unittest.cc
View file @ d4da57be
......@@ -1412,7 +1412,7 @@ class AppCacheStorageImplTest : public testing::Test {
EXPECT_TRUE(delegate()->found_entry_.IsExplicit());
EXPECT_FALSE(delegate()->found_fallback_entry_.has_response_id());
// Conduct another test perferring kManifestUrl
// Conduct another test preferring kManifestUrl
delegate_.reset(new MockStorageDelegate(this));
PushNextTask(base::Bind(
&AppCacheStorageImplTest::Verify_FindMainResponseWithMultipleHits2,
......@@ -1430,7 +1430,7 @@ class AppCacheStorageImplTest : public testing::Test {
EXPECT_TRUE(delegate()->found_entry_.IsExplicit());
EXPECT_FALSE(delegate()->found_fallback_entry_.has_response_id());
// Conduct the another test perferring kManifestUrl2
// Conduct the another test preferring kManifestUrl2
delegate_.reset(new MockStorageDelegate(this));
PushNextTask(base::Bind(
&AppCacheStorageImplTest::Verify_FindMainResponseWithMultipleHits3,
......
content/test/data/dom_storage/sanity_check.js
View file @ d4da57be
......@@ -60,14 +60,14 @@ function sanityCheck(storage) {
var tooLarge = makeLargeString((5 * 1024 * 1024) + 1);
try {
storage.setItem("tooLarge", tooLarge);
throw "failed to throw execption for very large value";
throw "failed to throw exception for very large value";
} catch(ex) {
checkEqual(ex.code, 22,
"ex.code != 22 for attempt to store a very large value");
}
try {
storage.setItem(tooLarge, "key is too large");
throw "failed to throw execption for very large key";
throw "failed to throw exception for very large key";
} catch(ex) {
checkEqual(ex.code, 22,
"ex.code != 22 for attempt to store a very large key");
......
media/video/capture/linux/video_capture_device_linux.cc
View file @ d4da57be
......@@ -34,7 +34,7 @@ enum { kContinuousTimeoutLimit = 10 };
// Time to wait in milliseconds before v4l2_thread_ reschedules OnCaptureTask
// if an event is triggered (select) but no video frame is read.
enum { kCaptureSelectWaitMs = 10 };
// MJPEG is prefered if the width or height is larger than this.
// MJPEG is preferred if the width or height is larger than this.
enum { kMjpegWidth = 640 };
enum { kMjpegHeight = 480 };
// Typical framerate, in fps
......
webkit/glue/webkit_strings.grd
View file @ d4da57be
......@@ -290,13 +290,13 @@ below:
<message name="IDS_FORM_OTHER_WEEK_LABEL" desc="Label for button that opens a full week picker so the user can choose dates other than the ones in the list." meaning="for week label">
Other...
</message>
<message name="IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD" desc="Text for denoting day of month field position in date format. Short text is prefered. See http://crbug.com/152632 for samples.">
<message name="IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD" desc="Text for denoting day of month field position in date format. Short text is preferred. See http://crbug.com/152632 for samples.">
dd
</message>
<message name="IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD" desc="Text for denoting month field position in date format. Short text is prefered. See http://crbug.com/152632 for samples.">
<message name="IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD" desc="Text for denoting month field position in date format. Short text is preferred. See http://crbug.com/152632 for samples.">
mm
</message>
<message name="IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD" desc="Text for denoting day of month field position in date format. Short text is prefered. See http://crbug.com/152632 for samples.">
<message name="IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD" desc="Text for denoting day of month field position in date format. Short text is preferred. See http://crbug.com/152632 for samples.">
yyyy
</message>
<message name="IDS_FORM_SELECT_MENU_LIST_TEXT" desc="Text for the menu list rendering of a select element.">
......
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