chrome/browser/ui/views/avatar_menu.cc - Issue 7622001: Revert 96306 - Multi-Profiles: Change avatar menu to bubble view

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/avatar_menu.cc

Issue 7622001: Revert 96306 - Multi-Profiles: Change avatar menu to bubble view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/ui/views/avatar_menu.h ('k') | chrome/browser/ui/views/avatar_menu_bubble_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/avatar_menu.h"	5 #include "chrome/browser/ui/views/avatar_menu.h"

6	6

7 #include "base/string_number_conversions.h"	7 #include "base/string_number_conversions.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

(...skipping 179 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 // deleted while we're running we won't prematurely delete the menu.	190 // deleted while we're running we won't prematurely delete the menu.

191 // TODO(sky): fix this, the menu should really take ownership of the menu	191 // TODO(sky): fix this, the menu should really take ownership of the menu

192 // (57890).	192 // (57890).

193 scoped_refptr<AvatarMenu> dont_delete_while_running(this);	193 scoped_refptr<AvatarMenu> dont_delete_while_running(this);

194 gfx::Point screen_loc;	194 gfx::Point screen_loc;

195 views::View::ConvertPointToScreen(host, &screen_loc);	195 views::View::ConvertPointToScreen(host, &screen_loc);

196 gfx::Rect bounds(screen_loc, host->size());	196 gfx::Rect bounds(screen_loc, host->size());

197 root_->RunMenuAt(host->GetWidget(), host, bounds,	197 root_->RunMenuAt(host->GetWidget(), host, bounds,

198 views::MenuItemView::TOPLEFT, true);	198 views::MenuItemView::TOPLEFT, true);

199 }	199 }

OLD	NEW