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

Unified Diff: chrome/browser/views/toolbar_view.h

Issue 12895: Chromium-MultiProfile-Prototype... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/select_profile_dialog.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/toolbar_view.h
===================================================================
--- chrome/browser/views/toolbar_view.h (revision 6272)
+++ chrome/browser/views/toolbar_view.h (working copy)
@@ -7,10 +7,12 @@
#include <vector>
+#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/back_forward_menu_model.h"
#include "chrome/browser/controller.h"
#include "chrome/browser/encoding_menu_controller_delegate.h"
+#include "chrome/browser/user_data_manager.h"
#include "chrome/browser/views/dom_view.h"
#include "chrome/browser/views/go_button.h"
#include "chrome/browser/views/location_bar_view.h"
@@ -37,7 +39,8 @@
public views::ViewMenuDelegate,
public views::DragController,
public LocationBarView::Delegate,
- public NotificationObserver {
+ public NotificationObserver,
+ public GetProfilesHelper::Delegate {
public:
BrowserToolbarView(CommandController* controller, Browser* browser);
virtual ~BrowserToolbarView();
@@ -57,11 +60,15 @@
virtual bool IsItemChecked(int id) const;
// Overridden from Menu::BaseControllerDelegate:
+ virtual void ExecuteCommand(int id);
virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel);
// views::MenuDelegate
virtual void RunMenu(views::View* source, const CPoint& pt, HWND hwnd);
+ // GetProfilesHelper::Delegate method.
+ virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
+
// Sets the profile which is active on the currently-active tab.
void SetProfile(Profile* profile);
Profile* profile() { return profile_; }
@@ -180,6 +187,12 @@
// Current tab we're showing state for.
TabContents* tab_;
+ // Profiles menu to populate with profile names.
+ Menu* profiles_menu_;
+
+ // Helper class to enumerate profiles information on the file thread.
+ scoped_refptr<GetProfilesHelper> profiles_helper_;
+
// Controls whether or not a home button should be shown on the toolbar.
BooleanPrefMember show_home_button_;
@@ -188,4 +201,3 @@
};
#endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__
-
« no previous file with comments | « chrome/browser/views/select_profile_dialog.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698