diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-09 22:22:08 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-09 22:22:08 +0000 |
| commit | 99e4d4c0c61ca0d7548097520fb4dbeb998086f9 (patch) | |
| tree | d9ca68fe9ae6c242acc8663a6d34ef485de7b377 /chrome/browser/ui/views/frame | |
| parent | 8a4751337e754922bf46834b8b3c277a4dcdb44b (diff) | |
| download | chromium_src-99e4d4c0c61ca0d7548097520fb4dbeb998086f9.zip chromium_src-99e4d4c0c61ca0d7548097520fb4dbeb998086f9.tar.gz chromium_src-99e4d4c0c61ca0d7548097520fb4dbeb998086f9.tar.bz2 | |
Multi-Profiles: Add icon chooser to profiles menu
This change adds an icon chooser grid to the profiles menu. This is only implemented for toolkit views for now.
Screenshots: http://www.dropmocks.com/mXGba
BUG=
TEST=
Review URL: http://codereview.chromium.org/7331017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/frame')
| -rw-r--r-- | chrome/browser/ui/views/frame/glass_browser_frame_view.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index ab6f1f0..adbc5b8 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -14,7 +14,6 @@ #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/themes/theme_service.h" -#include "chrome/browser/ui/profile_menu_model.h" #include "chrome/browser/ui/views/avatar_menu_button.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/tabs/side_tab_strip.h" @@ -86,10 +85,8 @@ GlassBrowserFrameView::GlassBrowserFrameView(BrowserFrame* frame, InitThrobberIcons(); if (browser_view_->ShouldShowAvatar()) { - 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( + browser_view_->browser(), !browser_view_->IsOffTheRecord())); AddChildView(avatar_button_.get()); UpdateAvatarInfo(); if (!browser_view_->IsOffTheRecord()) { 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 995a0cf..37f84c4 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -13,7 +13,6 @@ #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/themes/theme_service.h" -#include "chrome/browser/ui/profile_menu_model.h" #include "chrome/browser/ui/views/avatar_menu_button.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" @@ -202,10 +201,8 @@ OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame, } if (browser_view_->ShouldShowAvatar()) { - 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( + browser_view_->browser(), !browser_view_->IsOffTheRecord())); AddChildView(avatar_button_.get()); UpdateAvatarInfo(); if (!browser_view_->IsOffTheRecord()) { |