chrome/browser/ui/views/frame/browser_non_client_frame_view.cc - Issue 10538082: Update use of OTR avatars for touch. We now select

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 10538082: Update use of OTR avatars for touch. We now select (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Aura build, merge to LKGR Created 8 years, 6 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:

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 405bb62642e71d67bbd5b220ba6f274b2f6d4cfb..42430089d6e415179cb7bb1d5b863bb1c89c962a 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

@@ -52,7 +52,7 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() {

NOTREACHED();

#endif

} else if (browser_view_->IsOffTheRecord()) {

- avatar = rb.GetImageNamed(IDR_OTR_ICON);

+ avatar = rb.GetImageNamed(browser_view_->GetOTRIconResourceID());

} else if (ManagedMode::IsInManagedMode()) {

avatar = rb.GetImageNamed(IDR_MANAGED_MODE_AVATAR);

} else if (AvatarMenuModel::ShouldShowAvatarMenu()) {