Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

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

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
OLDNEW
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 #ifndef CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 18 matching lines...) Expand all
29 // The views menu. 29 // The views menu.
30 scoped_ptr<views::MenuItemView> root_; 30 scoped_ptr<views::MenuItemView> root_;
31 31
32 // Profile the menu is being shown for. 32 // Profile the menu is being shown for.
33 Profile* profile_; 33 Profile* profile_;
34 34
35 DISALLOW_COPY_AND_ASSIGN(AvatarMenu); 35 DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
36 }; 36 };
37 37
38 #endif // CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_H_ 38 #endif // CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/avatar_menu_model_observer.h ('k') | chrome/browser/ui/views/avatar_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698