summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser.cc2
-rw-r--r--chrome/browser/ui/browser_init.cc4
-rw-r--r--chrome/browser/ui/browser_list.h2
-rw-r--r--chrome/browser/ui/find_bar/find_bar_state.h2
-rw-r--r--chrome/browser/ui/views/browser_actions_container.h2
-rw-r--r--chrome/browser/ui/views/frame/browser_view.h4
-rw-r--r--chrome/browser/ui/views/options/content_exceptions_table_view.h2
-rw-r--r--chrome/browser/ui/views/options/exceptions_view.h2
8 files changed, 10 insertions, 10 deletions
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_;