summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 22:02:04 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 22:02:04 +0000
commitccb55cf5b25fd67078e51b924cf6e694d7374376 (patch)
treeb04cd09754ea2cdc2ee6d333166de81688a97c8e /chrome/browser/browser.cc
parent42695f09883e29aa167b79ad75263e3d611dce2d (diff)
downloadchromium_src-ccb55cf5b25fd67078e51b924cf6e694d7374376.zip
chromium_src-ccb55cf5b25fd67078e51b924cf6e694d7374376.tar.gz
chromium_src-ccb55cf5b25fd67078e51b924cf6e694d7374376.tar.bz2
Initial implementation of status tray functionality (mac-only, currently).
Added Mac implementation of StatusIcon, and added a simple click callback that displays the "extensions" tab when clicked on, to allow us to dogfood long-lived extensions. BUG=37375 Review URL: http://codereview.chromium.org/661454 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 40d1072..344a660 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -406,19 +406,20 @@ void Browser::OpenDownloadsWindow(Profile* profile) {
}
// static
-void Browser::OpenExtensionsWindow(Profile* profile) {
+void Browser::OpenHelpWindow(Profile* profile) {
Browser* browser = Browser::Create(profile);
- browser->ShowExtensionsTab();
+ browser->OpenHelpTab();
browser->window()->Show();
}
+#endif
// static
-void Browser::OpenHelpWindow(Profile* profile) {
+void Browser::OpenExtensionsWindow(Profile* profile) {
Browser* browser = Browser::Create(profile);
- browser->OpenHelpTab();
+ browser->ShowExtensionsTab();
browser->window()->Show();
}
-#endif
+
///////////////////////////////////////////////////////////////////////////////
// Browser, State Storage and Retrieval for UI: