chrome/browser/ui/views/frame/opaque_browser_frame_view.cc - Issue 7331017: Multi-Profiles: Add icon chooser to profiles menu

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/opaque_browser_frame_view.cc

Issue 7331017: Multi-Profiles: Add icon chooser to profiles menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove debug code Created 9 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:

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

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

index 995a0cf154ade2a201b12ff7ab5097452271b6bb..c533c5af20c838f0eb212863dedfecf32f7d9650 100644

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

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

@@ -205,7 +205,8 @@ OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,

ui::MenuModel* menu_model = browser_view_->IsOffTheRecord() ?

NULL : new ProfileMenuModel(browser_view_->browser());

// AvatarMenuButton takes ownership of |menu_model|.

- avatar_button_.reset(new AvatarMenuButton(std::wstring(), menu_model));

+ avatar_button_.reset(new AvatarMenuButton(std::wstring(), menu_model,

+ browser_view_->browser()));

AddChildView(avatar_button_.get());

UpdateAvatarInfo();

if (!browser_view_->IsOffTheRecord()) {