summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/toolbar_view.h
diff options
context:
space:
mode:
authormunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 23:52:03 +0000
committermunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 23:52:03 +0000
commitf253006b157f9c917fba21a7312290aaa2e889e7 (patch)
tree377183f9511bed141b5fd7a706c3407a122540d9 /chrome/browser/views/toolbar_view.h
parentdadacf06556b4f63a62ec3cea91d7fc5abccd67c (diff)
downloadchromium_src-f253006b157f9c917fba21a7312290aaa2e889e7.zip
chromium_src-f253006b157f9c917fba21a7312290aaa2e889e7.tar.gz
chromium_src-f253006b157f9c917fba21a7312290aaa2e889e7.tar.bz2
Chromium-MultiProfile-Prototype
Summary ======= Implement a prototype of multiple profiles in Chrome by utilizing the functionality of user-data-dir command line flag that already exists. A profile in this case is an umbrella for all user data including cookies, history, bookmarks, settings, etc. Each profile gives the user a separation of all these data elements. User Interface ============== - Wrench > "New window in profile" menu item, with sub-menu items. This new menu item has sub menu items for each existing profile, for up to 9 profiles, and one more sub menu item to launch a window in a new profile. The 9 sub-menu items also have the accelerators like CTRL + SHIFT + 1, CTRL + SHIFT + 2, etc. If there are more than 9 profiles, we will also show an extra sub-menu item, "Other...". - New Profile dialog box This dialog box is shown to the use when (s)he clicks Wrench > New window in profile > <New Profile>. It lets the user specify a profile name, and also shows a checkbox to create a desktop shortcut to launch Chrome in that profile. - Choose profile dialog box This dialog box lets the user select a profile from a drop down to open a new window in. It also has an item <New Profile> in the drop down, selecting which will show the new profile dialog box mentioned above. CTRL + M shortcut also launches this dialog box. Code Organization ================= chrome\browser\user_data_dir_profile_manager.h/.cc: This class provides an abstraction of profiles on top of the user data dir command line flag. chrome\browser\views\user_data_dir_new_profile_dialog.h/.cc New profile dialog box code. chrome\browser\views\user_data_dir_profiles_dialog.h/.cc Choose profile dialog box code. Review URL: http://codereview.chromium.org/12895 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.h')
-rw-r--r--chrome/browser/views/toolbar_view.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index 6358e7a..a8067e2 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -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 @@ class BrowserToolbarView : public views::View,
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 @@ class BrowserToolbarView : public views::View,
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 @@ class BrowserToolbarView : public views::View,
// 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 @@ class BrowserToolbarView : public views::View,
};
#endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__
-