chrome/browser/ui/views/frame/browser_non_client_frame_view.cc - Issue 2129373002: Replace all occurrences of words meaning "off the record" with "incognito"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

Issue 2129373002: Replace all occurrences of words meaning "off the record" with "incognito" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

index 7d886067529b0bac74ff1b05ec8f01e46a9f0de8..98e42f6f43cf99e0c12b93b879e17a008b0dd60b 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

@@ -55,7 +55,7 @@ BrowserNonClientFrameView::~BrowserNonClientFrameView() {

void BrowserNonClientFrameView::OnBrowserViewInitViewsComplete() {}

-gfx::ImageSkia BrowserNonClientFrameView::GetOTRAvatarIcon() const {

+gfx::ImageSkia BrowserNonClientFrameView::GetIncognitoAvatarIcon() const {

if (!ui::MaterialDesignController::IsModeMaterial())

return *GetThemeProviderForProfile()->GetImageSkiaNamed(IDR_OTR_ICON);

const SkColor icon_color = color_utils::PickContrastingColor(

@@ -170,7 +170,7 @@ void BrowserNonClientFrameView::UpdateProfileIndicatorIcon() {

gfx::Image icon;

const Profile* profile = browser_view()->browser()->profile();

if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE) {

- icon = gfx::Image(GetOTRAvatarIcon());

+ icon = gfx::Image(GetIncognitoAvatarIcon());

if (!ui::MaterialDesignController::IsModeMaterial())

profile_indicator_icon_->EnableCanvasFlippingForRTLUI(true);

} else {