chrome/browser/ui/views/profile_menu_button.cc - Issue 7138003: Revert 88683 - Change profile menu button to avatar button

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

Issue 7138003: Revert 88683 - Change profile menu button to avatar button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

View unified diff | Download patch | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/ui/views/profile_menu_button.h ('k') | chrome/browser/ui/views/profile_tag_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/profile_menu_button.h"	5 #include "chrome/browser/ui/views/profile_menu_button.h"

6	6

7 #include "chrome/browser/ui/profile_menu_model.h"	7 #include "chrome/browser/ui/profile_menu_model.h"

8 #include "ui/base/text/text_elider.h"	8 #include "ui/base/text/text_elider.h"

9 #include "ui/gfx/color_utils.h"	9 #include "ui/gfx/color_utils.h"

10 #include "views/controls/button/button.h"	10 #include "views/controls/button/button.h"

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 views::MenuModelAdapter menu_model_adapter(profile_menu_model_.get());	53 views::MenuModelAdapter menu_model_adapter(profile_menu_model_.get());

54 views::MenuItemView menu(&menu_model_adapter);	54 views::MenuItemView menu(&menu_model_adapter);

55 menu_model_adapter.BuildMenu(&menu);	55 menu_model_adapter.BuildMenu(&menu);

56	56

57 gfx::Point menu_point(pt.x(), pt.y() + kMenuDisplayOffset);	57 gfx::Point menu_point(pt.x(), pt.y() + kMenuDisplayOffset);

58 menu.RunMenuAt(source->GetWidget()->GetNativeWindow(), NULL,	58 menu.RunMenuAt(source->GetWidget()->GetNativeWindow(), NULL,

59 gfx::Rect(pt, gfx::Size(0, 0)),	59 gfx::Rect(pt, gfx::Size(0, 0)),

60 views::MenuItemView::TOPRIGHT,	60 views::MenuItemView::TOPRIGHT,

61 true);	61 true);

62 }	62 }

OLD	NEW