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

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

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const gfx::Point& point) OVERRIDE; 53 const gfx::Point& point) OVERRIDE;
54 54
55 void ButtonClicked(); 55 void ButtonClicked();
56 56
57 Browser* browser_; 57 Browser* browser_;
58 bool incognito_; 58 bool incognito_;
59 scoped_ptr<ui::MenuModel> menu_model_; 59 scoped_ptr<ui::MenuModel> menu_model_;
60 60
61 // Use a scoped ptr because gfx::Image doesn't have a default constructor. 61 // Use a scoped ptr because gfx::Image doesn't have a default constructor.
62 scoped_ptr<gfx::Image> icon_; 62 scoped_ptr<gfx::Image> icon_;
63 SkBitmap button_icon_; 63 gfx::ImageSkia button_icon_;
64 bool is_gaia_picture_; 64 bool is_gaia_picture_;
65 int old_height_; 65 int old_height_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton); 67 DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton);
68 }; 68 };
69 69
70 #endif // CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUTTON_H_ 70 #endif // CHROME_BROWSER_UI_VIEWS_AVATAR_MENU_BUTTON_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/avatar_menu_bubble_view.cc ('k') | chrome/browser/ui/views/avatar_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698