diff options
47 files changed, 74 insertions, 74 deletions
@@ -95,3 +95,4 @@ Sam McDonald <sam@sammcd.com> Magnus Danielsson <fuzzac@gmail.com> Kushal Pisavadia <kushi.p@gmail.com> Maarten Lankhorst <m.b.lankhorst@gmail.com> +Vipul Bhasin <vipul.bhasin@gmail.com> diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index 603da88..3e90942 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -68,7 +68,7 @@ TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); - // Create an off the record window. + // Create an incognito window. ASSERT_TRUE(browser_proxy->RunCommand(IDC_NEW_INCOGNITO_WINDOW)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index ed308bb..8263aa9 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -349,7 +349,7 @@ void SearchProvider::StartOrStopSuggestQuery(bool minimal_changes) { } bool SearchProvider::IsQuerySuitableForSuggest() const { - // Don't run Suggest when off the record, the engine doesn't support it, or + // Don't run Suggest in incognito mode, the engine doesn't support it, or // the user has disabled it. if (profile_->IsOffTheRecord() || (!providers_.valid_suggest_for_keyword_provider() && diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 00d2d41..74d32e4 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -279,7 +279,7 @@ DictionaryValue* AutomationProvider::GetDictionaryFromDownloadItem( dl_item_value->SetBoolean("is_extension_install", download->is_extension_install()); dl_item_value->SetBoolean("is_temporary", download->is_temporary()); - dl_item_value->SetBoolean("is_otr", download->is_otr()); // off-the-record + dl_item_value->SetBoolean("is_otr", download->is_otr()); // incognito dl_item_value->SetString("state", state_to_string[download->state()]); dl_item_value->SetString("safety_state", safety_state_to_string[download->safety_state()]); diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 90b6965..7274b7c 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -3435,7 +3435,7 @@ void TestingAutomationProvider::AddSavedPassword( GetPasswordFormFromDict(*password_dict); Profile* profile = browser->profile(); - // Use IMPLICIT_ACCESS since new passwords aren't added off the record. + // Use IMPLICIT_ACCESS since new passwords aren't added in incognito mode. PasswordStore* password_store = profile->GetPasswordStore(Profile::IMPLICIT_ACCESS); @@ -3478,7 +3478,7 @@ void TestingAutomationProvider::RemoveSavedPassword( GetPasswordFormFromDict(*password_dict); Profile* profile = browser->profile(); - // Use EXPLICIT_ACCESS since passwords can be removed off the record. + // Use EXPLICIT_ACCESS since passwords can be removed in incognito mode. PasswordStore* password_store = profile->GetPasswordStore(Profile::EXPLICIT_ACCESS); @@ -3494,7 +3494,7 @@ void TestingAutomationProvider::GetSavedPasswords( DictionaryValue* args, IPC::Message* reply_message) { Profile* profile = browser->profile(); - // Use EXPLICIT_ACCESS since saved passwords can be retreived off the record. + // Use EXPLICIT_ACCESS since saved passwords can be retreived in incognito mode. PasswordStore* password_store = profile->GetPasswordStore(Profile::EXPLICIT_ACCESS); password_store->GetAutofillableLogins( diff --git a/chrome/browser/background_contents_service.cc b/chrome/browser/background_contents_service.cc index 0a35d8c..fd88660 100644 --- a/chrome/browser/background_contents_service.cc +++ b/chrome/browser/background_contents_service.cc @@ -42,7 +42,7 @@ BackgroundContentsService::BackgroundContentsService( Profile* profile, const CommandLine* command_line) : prefs_(NULL) { // Don't load/store preferences if the proper switch is not enabled, or if - // the parent profile is off the record. + // the parent profile is incognito. if (!profile->IsOffTheRecord() && !command_line->HasSwitch(switches::kDisableRestoreBackgroundContents)) prefs_ = profile->GetPrefs(); diff --git a/chrome/browser/background_contents_service.h b/chrome/browser/background_contents_service.h index fc5d00a..ee29f07 100644 --- a/chrome/browser/background_contents_service.h +++ b/chrome/browser/background_contents_service.h @@ -129,7 +129,7 @@ class BackgroundContentsService : private NotificationObserver, bool IsTracked(BackgroundContents* contents) const; // PrefService used to store list of background pages (or NULL if this is - // running under an off-the-record profile). + // running under an incognito profile). PrefService* prefs_; NotificationRegistrar registrar_; diff --git a/chrome/browser/chromeos/login/authenticator.h b/chrome/browser/chromeos/login/authenticator.h index 4096b1f..32cdf3a 100644 --- a/chrome/browser/chromeos/login/authenticator.h +++ b/chrome/browser/chromeos/login/authenticator.h @@ -47,7 +47,7 @@ class Authenticator : public base::RefCountedThreadSafe<Authenticator> { virtual bool AuthenticateToUnlock(const std::string& username, const std::string& password) = 0; - // Initiates off the record ("browse without signing in") login. + // Initiates incognito ("browse without signing in") login. virtual void LoginOffTheRecord() = 0; // |credentials| are the tokens that we get back from the ClientLogin API. diff --git a/chrome/browser/chromeos/login/google_authenticator.h b/chrome/browser/chromeos/login/google_authenticator.h index a91c73c..e9f180e 100644 --- a/chrome/browser/chromeos/login/google_authenticator.h +++ b/chrome/browser/chromeos/login/google_authenticator.h @@ -65,7 +65,7 @@ class GoogleAuthenticator : public Authenticator, public GaiaAuthConsumer { bool AuthenticateToUnlock(const std::string& username, const std::string& password); - // Initiates off the record ("browse without signing in") login. + // Initiates incognito ("browse without signing in") login. // Mounts tmpfs and notifies consumer on the success/failure. void LoginOffTheRecord(); diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index e10f01b..4b0928c 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -118,7 +118,7 @@ class LoginUtilsImpl : public LoginUtils { bool pending_requests); // Invoked after the tmpfs is successfully mounted. - // Launches a browser in the off the record (incognito) mode. + // Launches a browser in the incognito mode. virtual void CompleteOffTheRecordLogin(const GURL& start_url); // Invoked when the user is logging in for the first time, or is logging in as @@ -385,7 +385,7 @@ void LoginUtilsImpl::RespectLocalePreference(Profile* profile) { } void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) { - VLOG(1) << "Completing off the record login"; + VLOG(1) << "Completing incognito login"; UserManager::Get()->OffTheRecordUserLoggedIn(); diff --git a/chrome/browser/chromeos/login/new_user_view.h b/chrome/browser/chromeos/login/new_user_view.h index 7a38c02..9762f94 100644 --- a/chrome/browser/chromeos/login/new_user_view.h +++ b/chrome/browser/chromeos/login/new_user_view.h @@ -43,7 +43,7 @@ class NewUserView : public ThrobberHostView, virtual void OnLogin(const std::string& username, const std::string& password) = 0; - // Initiates off the record (incognito) login. + // Initiates incognito login. virtual void OnLoginAsGuest() = 0; // User initiated new account creation. diff --git a/chrome/browser/chromeos/login/parallel_authenticator.h b/chrome/browser/chromeos/login/parallel_authenticator.h index 4db578f..a71de58 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.h +++ b/chrome/browser/chromeos/login/parallel_authenticator.h @@ -118,7 +118,7 @@ class ParallelAuthenticator : public Authenticator, bool AuthenticateToUnlock(const std::string& username, const std::string& password); - // Initiates off the record ("browse without signing in") login. + // Initiates incognito ("browse without signing in") login. // Mounts tmpfs and notifies consumer on the success/failure. void LoginOffTheRecord(); diff --git a/chrome/browser/chromeos/login/user_manager.h b/chrome/browser/chromeos/login/user_manager.h index 5ffee71..5ff5ce7 100644 --- a/chrome/browser/chromeos/login/user_manager.h +++ b/chrome/browser/chromeos/login/user_manager.h @@ -65,7 +65,7 @@ class UserManager : public UserImageLoader::Delegate, // It is sorted in order of recency, with most recent at the beginning. virtual std::vector<User> GetUsers() const; - // Indicates that user just started off the record session. + // Indicates that user just started incognito session. virtual void OffTheRecordUserLoggedIn(); // Indicates that a user with the given email has just logged in. diff --git a/chrome/browser/content_settings/content_settings_base_provider.cc b/chrome/browser/content_settings/content_settings_base_provider.cc index b0e7ced..fdfdc6f 100644 --- a/chrome/browser/content_settings/content_settings_base_provider.cc +++ b/chrome/browser/content_settings/content_settings_base_provider.cc @@ -97,8 +97,8 @@ ContentSetting BaseProvider::GetContentSetting( requested_setting)->second; } - // If this map is not for an off-the-record profile, these searches will never - // match. The additional off-the-record exceptions always overwrite the + // If this map is not for an incognito profile, these searches will never + // match. The additional incognito exceptions always overwrite the // regular ones. i = off_the_record_settings_.find(host); if (i != off_the_record_settings_.end() && @@ -189,8 +189,8 @@ ContentSettings BaseProvider::GetNonDefaultContentSettings( if (i != host_content_settings_.end()) output = i->second.content_settings; - // If this map is not for an off-the-record profile, these searches will never - // match. The additional off-the-record exceptions always overwrite the + // If this map is not for an incognito profile, these searches will never + // match. The additional incognito exceptions always overwrite the // regular ones. i = off_the_record_settings_.find(host); if (i != off_the_record_settings_.end()) { diff --git a/chrome/browser/content_settings/content_settings_base_provider.h b/chrome/browser/content_settings/content_settings_base_provider.h index 1e6c9e4..bbfa6e9 100644 --- a/chrome/browser/content_settings/content_settings_base_provider.h +++ b/chrome/browser/content_settings/content_settings_base_provider.h @@ -121,7 +121,7 @@ class BaseProvider : public ProviderInterface { bool is_off_the_record_; // Differences to the preference-stored host content settings for - // off-the-record settings. + // incognito settings. HostContentSettings off_the_record_settings_; // Used around accesses to the content_settings_ object to guarantee diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index fda116de..6d223da 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -107,7 +107,7 @@ TEST_F(PrefDefaultProviderTest, OffTheRecord) { otr_provider.ProvideDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES)); // Changing content settings on the main provider should also affect the - // off-the-record map. + // incognito map. provider.UpdateDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, @@ -115,7 +115,7 @@ TEST_F(PrefDefaultProviderTest, OffTheRecord) { EXPECT_EQ(CONTENT_SETTING_BLOCK, otr_provider.ProvideDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES)); - // Changing content settings on the off-the-record provider should be ignored. + // Changing content settings on the incognito provider should be ignored. otr_provider.UpdateDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_ALLOW); EXPECT_EQ(CONTENT_SETTING_BLOCK, diff --git a/chrome/browser/content_settings/content_settings_provider.h b/chrome/browser/content_settings/content_settings_provider.h index eff1443..88c0a6f 100644 --- a/chrome/browser/content_settings/content_settings_provider.h +++ b/chrome/browser/content_settings/content_settings_provider.h @@ -98,7 +98,7 @@ class ProviderInterface { // For a given content type, returns all content setting rules with a // non-default setting, mapped to their actual settings. // |content_settings_rules| must be non-NULL. If this provider was created for - // the off-the-record profile, it will only return those settings differing + // the incognito profile, it will only return those settings differing // from the corresponding regular provider. For ContentSettingsTypes that // require a resource identifier to be specified, the |resource_identifier| // must be non-empty. diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index bdfc318..c6feb8d 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -94,7 +94,7 @@ class HostContentSettingsMap // For a given content type, returns all patterns with a non-default setting, // mapped to their actual settings, in lexicographical order. |settings| // must be a non-NULL outparam. If this map was created for the - // off-the-record profile, it will only return those settings differing from + // incognito profile, it will only return those settings differing from // the main map. For ContentSettingsTypes that require an resource identifier // to be specified, the |resource_identifier| must be non-empty. // @@ -104,7 +104,7 @@ class HostContentSettingsMap SettingsForOneType* settings) const; // Sets the default setting for a particular content type. This method must - // not be invoked on an off-the-record map. + // not be invoked on an incognito map. // // This should only be called on the UI thread. void SetDefaultContentSetting(ContentSettingsType content_type, @@ -145,7 +145,7 @@ class HostContentSettingsMap } // Sets whether we block all third-party cookies. This method must not be - // invoked on an off-the-record map. + // invoked on an incognito map. // // This should only be called on the UI thread. void SetBlockThirdPartyCookies(bool block); diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 7748406..16daf33 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -464,7 +464,7 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) { host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Changing content settings on the main map should also affect the - // off-the-record map. + // incognito map. host_content_settings_map->SetContentSetting(pattern, CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, @@ -474,7 +474,7 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) { otr_map->GetContentSetting( host, CONTENT_SETTINGS_TYPE_IMAGES, "")); - // Changing content settings on the off-the-record map should NOT affect the + // Changing content settings on the incognito map should NOT affect the // main map. otr_map->SetContentSetting(pattern, CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_ALLOW); diff --git a/chrome/browser/extensions/extension_cookies_unittest.cc b/chrome/browser/extensions/extension_cookies_unittest.cc index bd69ef0..b46a9c4 100644 --- a/chrome/browser/extensions/extension_cookies_unittest.cc +++ b/chrome/browser/extensions/extension_cookies_unittest.cc @@ -23,8 +23,7 @@ struct DomainMatchCase { const bool matches; }; -// A test profile that supports linking with another profile for off-the-record -// (a.k.a. incognito) support. +// A test profile that supports linking with another profile for incognito support. class OtrTestingProfile : public TestingProfile { public: OtrTestingProfile() : linked_profile_(NULL) {} diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc index 4a3d901..e2963d4 100644 --- a/chrome/browser/extensions/extension_webstore_private_api.cc +++ b/chrome/browser/extensions/extension_webstore_private_api.cc @@ -87,8 +87,8 @@ DictionaryValue* CreateLoginResult(Profile* profile) { return dictionary; } -// If |profile| is not off the record, returns it. Otherwise returns the real -// (not off the record) default profile. +// If |profile| is not incognito, returns it. Otherwise returns the real +// (not incognito) default profile. Profile* GetDefaultProfile(Profile* profile) { if (!profile->IsOffTheRecord()) return profile; diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 4e831c2..9d26979 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -453,7 +453,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoInfobarForOffTheRecord) { CheckGeoposition(MockLocationProvider::instance_->position_); // Disables further prompts from this tab. CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)"); - // Go off the record, and checks no infobar will be created. + // Go incognito, and checks no infobar will be created. ASSERT_TRUE(Initialize(INITIALIZATION_OFFTHERECORD)); AddGeolocationWatch(false); CheckGeoposition(MockLocationProvider::instance_->position_); diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index ccf0603..9a0e035 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -518,7 +518,7 @@ void IOThread::ChangedToOnTheRecordOnIOThread() { // Clear all of the passively logged data. // TODO(eroman): this is a bit heavy handed, really all we need to do is - // clear the data pertaining to off the record context. + // clear the data pertaining to incognito context. net_log_->ClearAllPassivelyCapturedEvents(); } diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index e1a3c66..9c21971 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -1910,7 +1910,7 @@ void MetricsService::RecordPluginChanges(PrefService* pref) { bool MetricsService::CanLogNotification(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { - // We simply don't log anything to UMA if there is a single off the record + // We simply don't log anything to UMA if there is a single incognito // session visible. The problem is that we always notify using the orginal // profile in order to simplify notification processing. return !BrowserList::IsOffTheRecordSessionActive(); diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 90c0cbb..76cb345 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -411,7 +411,7 @@ void DesktopNotificationService::OnPrefsChanged(const std::string& pref_name) { void DesktopNotificationService::PersistPermissionChange( const GURL& origin, bool is_allowed) { - // Don't persist changes when off the record. + // Don't persist changes when incognito. if (profile_->IsOffTheRecord()) return; diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index dc98fcf..bfc8427 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -606,7 +606,7 @@ class OffTheRecordProfileImpl : public Profile, } virtual void InitChromeOSPreferences() { - // The off-the-record profile shouldn't have Chrome OS's preferences. + // The incognito profile shouldn't have Chrome OS's preferences. // The preferences are associated with the regular user profile. } #endif // defined(OS_CHROMEOS) @@ -615,7 +615,7 @@ class OffTheRecordProfileImpl : public Profile, // DownloadManager is lazily created, so check before accessing it. if (download_manager_.get()) { // Drop our download manager so we forget about all the downloads made - // in off-the-record mode. + // in incognito mode. download_manager_->Shutdown(); download_manager_ = NULL; } diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 31159f4..15d3b09 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -123,7 +123,7 @@ class Profile { enum ServiceAccessType { // The caller plans to perform a read or write that takes place as a result // of the user input. Use this flag when the operation you are doing can be - // performed while off the record. (ex: creating a bookmark) + // performed while incognito. (ex: creating a bookmark) // // Since EXPLICIT_ACCESS means "as a result of a user action", this request // always succeeds. @@ -132,7 +132,7 @@ class Profile { // The caller plans to call a method that will permanently change some data // in the profile, as part of Chrome's implicit data logging. Use this flag // when you are about to perform an operation which is incompatible with the - // off the record mode. + // incognito mode. IMPLICIT_ACCESS }; @@ -165,22 +165,22 @@ class Profile { // Returns the path of the directory where this profile's data is stored. virtual FilePath GetPath() = 0; - // Return whether this profile is off the record. Default is false. + // Return whether this profile is incognito. Default is false. virtual bool IsOffTheRecord() = 0; - // Return the off the record version of this profile. The returned pointer + // Return the incognito version of this profile. The returned pointer // is owned by the receiving profile. If the receiving profile is off the // record, the same profile is returned. virtual Profile* GetOffTheRecordProfile() = 0; - // Destroys the off the record profile. + // Destroys the incognito profile. virtual void DestroyOffTheRecordProfile() = 0; - // True if an off the record profile exists. + // True if an incognito profile exists. virtual bool HasOffTheRecordProfile() = 0; // Return the original "recording" profile. This method returns this if the - // profile is not off the record. + // profile is not incognito. virtual Profile* GetOriginalProfile() = 0; // Returns a pointer to the ChromeAppCacheService instance for this profile. @@ -391,11 +391,11 @@ class Profile { virtual FindBarState* GetFindBarState() = 0; // Returns the session service for this profile. This may return NULL. If - // this profile supports a session service (it isn't off the record), and + // this profile supports a session service (it isn't incognito), and // the session service hasn't yet been created, this forces creation of // the session service. // - // This returns NULL in two situations: the profile is off the record, or the + // This returns NULL in two situations: the profile is incognito, or the // session service has been explicitly shutdown (browser is exiting). Callers // should always check the return value for NULL. virtual SessionService* GetSessionService() = 0; @@ -436,7 +436,7 @@ class Profile { // Return whether 2 profiles are the same. 2 profiles are the same if they // represent the same profile. This can happen if there is pointer equality - // or if one profile is the off the record version of another profile (or vice + // or if one profile is the incognito version of another profile (or vice // versa). virtual bool IsSameProfile(Profile* profile) = 0; @@ -446,7 +446,7 @@ class Profile { // the user started chrome. virtual base::Time GetStartTime() const = 0; - // Returns the TabRestoreService. This returns NULL when off the record. + // Returns the TabRestoreService. This returns NULL when incognito. virtual TabRestoreService* GetTabRestoreService() = 0; virtual void ResetTabRestoreService() = 0; diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 0f679c7..b9faaa1 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -69,7 +69,7 @@ BaseSessionService::BaseSessionService(SessionType type, pending_reset_(false), commands_since_reset_(0) { if (profile) { - // We should never be created when off the record. + // We should never be created when incognito. DCHECK(!profile->IsOffTheRecord()); } backend_ = new SessionBackend(type, diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 496f671..917e095 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -352,7 +352,7 @@ TEST_F(SessionRestoreUITest, DontRestoreWhileIncognito) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); - // Create an off the record window. + // Create an incognito window. ASSERT_TRUE(browser_proxy->RunCommand(IDC_NEW_INCOGNITO_WINDOW)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index 39fc3a4..7829f29 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -1257,7 +1257,7 @@ bool SessionService::IsOnlyOneTabLeft() { } // NOTE: This uses the original profile so that closing the last non-off the - // record window while there are open off the record windows resets state). + // record window while there are open incognito windows resets state). int window_count = 0; for (BrowserList::const_iterator i = BrowserList::begin(); i != BrowserList::end(); ++i) { @@ -1283,7 +1283,7 @@ bool SessionService::HasOpenTrackableBrowsers(const SessionID& window_id) { } // NOTE: This uses the original profile so that closing the last non-off the - // record window while there are open off the record window resets state). + // record window while there are open incognito window resets state). for (BrowserList::const_iterator i = BrowserList::begin(); i != BrowserList::end(); ++i) { Browser* browser = *i; diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc index ab793316..f494bb5 100644 --- a/chrome/browser/tab_contents/thumbnail_generator.cc +++ b/chrome/browser/tab_contents/thumbnail_generator.cc @@ -664,7 +664,7 @@ bool ThumbnailGenerator::ShouldUpdateThumbnail(Profile* profile, const GURL& url) { if (!profile || !top_sites) return false; - // Skip if it's in the off-the-record mode. + // Skip if it's in the incognito mode. if (profile->IsOffTheRecord()) return false; // Skip if the given URL is not appropriate for history. diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc index ecc632a..73747c1 100644 --- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc +++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc @@ -338,12 +338,12 @@ TEST(ThumbnailGeneratorSimpleTest, ShouldUpdateThumbnail) { EXPECT_TRUE(ThumbnailGenerator::ShouldUpdateThumbnail( &profile, top_sites.get(), kGoodURL)); - // Should be false, if it's in the off-the-record mode. + // Should be false, if it's in the incognito mode. profile.set_off_the_record(true); EXPECT_FALSE(ThumbnailGenerator::ShouldUpdateThumbnail( &profile, top_sites.get(), kGoodURL)); - // Should be true again, once turning off the off-the-record mode. + // Should be true again, once turning off the incognito mode. profile.set_off_the_record(false); EXPECT_TRUE(ThumbnailGenerator::ShouldUpdateThumbnail( &profile, top_sites.get(), kGoodURL)); diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 626e053..b28fdd8 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -1567,7 +1567,7 @@ void Browser::BookmarkCurrentPage() { bookmark_utils::GetURLAndTitleToBookmark(tab, &url, &title); bool was_bookmarked = model->IsBookmarked(url); if (!was_bookmarked && profile_->IsOffTheRecord()) { - // If we're off the record the favicon may not have been saved. Save it now + // If we're incognito the favicon may not have been saved. Save it now // so that bookmarks have an icon for the page. tab->SaveFavicon(); } diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 2350b178..cddcfac 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -540,7 +540,7 @@ bool BrowserInit::LaunchBrowser(const CommandLine& command_line, } #endif - // Continue with the off-the-record profile from here on if --incognito + // Continue with the incognito profile from here on if --incognito if (command_line.HasSwitch(switches::kIncognito) && profile->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled)) { profile = profile->GetOffTheRecordProfile(); @@ -562,7 +562,7 @@ bool BrowserInit::LaunchBrowser(const CommandLine& command_line, #if defined(OS_CHROMEOS) // Initialize Chrome OS preferences like touch pad sensitivity. For the // preferences to work in the guest mode, the initialization has to be - // done after |profile| is switched to the off-the-record profile (which + // done after |profile| is switched to the incognito profile (which // is actually GuestSessionProfile in the guest mode). See the // GetOffTheRecordProfile() call above. profile->InitChromeOSPreferences(); diff --git a/chrome/browser/ui/browser_list.h b/chrome/browser/ui/browser_list.h index d11d4bf..c8cb0c4 100644 --- a/chrome/browser/ui/browser_list.h +++ b/chrome/browser/ui/browser_list.h @@ -158,7 +158,7 @@ class BrowserList { // currently open. static size_t GetBrowserCountForType(Profile* p, Browser::Type type); - // Returns true if at least one off the record session is active. + // Returns true if at least one incognito session is active. static bool IsOffTheRecordSessionActive(); // Send out notifications. diff --git a/chrome/browser/ui/find_bar/find_bar_state.h b/chrome/browser/ui/find_bar/find_bar_state.h index 57f2d2e..62465a3 100644 --- a/chrome/browser/ui/find_bar/find_bar_state.h +++ b/chrome/browser/ui/find_bar/find_bar_state.h @@ -28,7 +28,7 @@ class FindBarState { } // Retrieves the last prepopulate text for a given Profile. If the profile is - // off the record and has an empty prepopulate text, falls back to the + // incognito and has an empty prepopulate text, falls back to the // prepopulate text from the normal profile. static string16 GetLastPrepopulateText(Profile* profile); diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 22846c2..f9f6e38 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -443,7 +443,7 @@ class BrowserActionsContainer // Animate to the target size (unless testing, in which case we go straight to // the target size). This also saves the target number of visible icons in - // the pref if we're not off the record. + // the pref if we're not incognito. void SaveDesiredSizeAndAnimate(ui::Tween::Type type, size_t num_visible_icons); diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 911febc..7b45bdb 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -153,11 +153,11 @@ class BrowserView : public BrowserBubbleHost, bool UseVerticalTabs() const; // Returns true if the profile associated with this Browser window is - // off the record. + // incognito. bool IsOffTheRecord() const; // Returns true if the non-client view should render the Off-The-Record - // avatar icon if the window is off the record. + // avatar icon if the window is incognito. bool ShouldShowOffTheRecordAvatar() const; // Handle the specified |accelerator| being pressed. diff --git a/chrome/browser/ui/views/options/content_exceptions_table_view.h b/chrome/browser/ui/views/options/content_exceptions_table_view.h index f0b8dc2..184fb9d 100644 --- a/chrome/browser/ui/views/options/content_exceptions_table_view.h +++ b/chrome/browser/ui/views/options/content_exceptions_table_view.h @@ -9,7 +9,7 @@ #include "chrome/browser/content_exceptions_table_model.h" #include "views/controls/table/table_view.h" -// A thin wrapper around TableView that displays off-the-record entries in +// A thin wrapper around TableView that displays incognito entries in // italics. class ContentExceptionsTableView : public views::TableView { public: diff --git a/chrome/browser/ui/views/options/exceptions_view.h b/chrome/browser/ui/views/options/exceptions_view.h index d168685..4e920ca 100644 --- a/chrome/browser/ui/views/options/exceptions_view.h +++ b/chrome/browser/ui/views/options/exceptions_view.h @@ -100,7 +100,7 @@ class ExceptionsView : public ExceptionEditorView::Delegate, // The model displayed in the table. ContentExceptionsTableModel model_; - // True if the user can also add off the record entries. + // True if the user can also add incognito entries. bool allow_off_the_record_; views::TableView* table_; diff --git a/chrome/browser/visitedlink/visitedlink_master.cc b/chrome/browser/visitedlink/visitedlink_master.cc index ad4ad45..eafaf48 100644 --- a/chrome/browser/visitedlink/visitedlink_master.cc +++ b/chrome/browser/visitedlink/visitedlink_master.cc @@ -261,7 +261,7 @@ bool VisitedLinkMaster::Init() { } VisitedLinkMaster::Hash VisitedLinkMaster::TryToAddURL(const GURL& url) { - // Extra check that we are not off the record. This should not happen. + // Extra check that we are not incognito. This should not happen. if (profile_ && profile_->IsOffTheRecord()) { NOTREACHED(); return null_hash_; diff --git a/chrome/plugin/plugin_channel.h b/chrome/plugin/plugin_channel.h index 6c561f3..8e477af 100644 --- a/chrome/plugin/plugin_channel.h +++ b/chrome/plugin/plugin_channel.h @@ -90,7 +90,7 @@ class PluginChannel : public PluginChannelBase { int in_send_; // Tracks if we're in a Send call. bool log_messages_; // True if we should log sent and received messages. - bool off_the_record_; // True if the renderer is in off the record mode. + bool off_the_record_; // True if the renderer is in incognito mode. scoped_refptr<MessageFilter> filter_; // Handles the modal dialog events. DISALLOW_COPY_AND_ASSIGN(PluginChannel); diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index e2d77868..a37a6ee 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -130,7 +130,7 @@ class TestingProfile : public Profile { virtual FilePath GetPath(); - // Sets whether we're off the record. Default is false. + // Sets whether we're incognito. Default is false. void set_off_the_record(bool off_the_record) { off_the_record_ = off_the_record; } diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h index dc00afa..ad6acdf 100644 --- a/chrome/test/ui_test_utils.h +++ b/chrome/test/ui_test_utils.h @@ -121,9 +121,9 @@ Browser* WaitForNewBrowser(); // called. Browser* WaitForNewBrowserWithCount(size_t start_count); -// Opens |url| in an incognito browser window with the off the record profile of +// Opens |url| in an incognito browser window with the incognito profile of // |profile|, blocking until the navigation finishes. This will create a new -// browser if a browser with the off the record profile does not exist. +// browser if a browser with the incognito profile does not exist. void OpenURLOffTheRecord(Profile* profile, const GURL& url); // Navigates the selected tab of |browser| to |url|, blocking until the diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index 5e7557f..e2aaa07 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -359,7 +359,7 @@ class RenderMessageFilter : public BrowserMessageFilter, // Handles zoom-related messages. scoped_refptr<HostZoomMap> host_zoom_map_; - // Whether this process is used for off the record tabs. + // Whether this process is used for incognito tabs. bool off_the_record_; base::TimeTicks last_plugin_refresh_time_; // Initialized to 0. diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index f4a5443..0f00626 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -364,7 +364,7 @@ class OCSPRequestSession request_ = new net::URLRequest(url_, this); request_->set_context(url_request_context); - // To meet the privacy requirements of off-the-record mode. + // To meet the privacy requirements of incognito mode. request_->set_load_flags( net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES); diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/plugins/npapi/webplugin.h index 4a89e43..9dd1c57 100644 --- a/webkit/plugins/npapi/webplugin.h +++ b/webkit/plugins/npapi/webplugin.h @@ -138,7 +138,7 @@ class WebPlugin { const char* range_info, int range_request_id) = 0; - // Returns true iff in off the record (Incognito) mode. + // Returns true iff in incognito mode. virtual bool IsOffTheRecord() = 0; // Called when the WebPluginResourceClient instance is deleted. |