diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:02:04 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:02:04 +0000 |
| commit | ccb55cf5b25fd67078e51b924cf6e694d7374376 (patch) | |
| tree | b04cd09754ea2cdc2ee6d333166de81688a97c8e /chrome/browser/browser_init.cc | |
| parent | 42695f09883e29aa167b79ad75263e3d611dce2d (diff) | |
| download | chromium_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_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index fe1866f..9f92ad8 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -33,6 +33,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/browser/status_icons/status_tray_manager.h" #include "chrome/browser/user_data_manager.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -389,6 +390,17 @@ bool BrowserInit::LaunchBrowser( lib->AddObserver(observe); } #endif +#if defined(OS_MACOSX) + // TODO(atwilson): Status tray UI is currently only supported on the mac + // (http://crbug.com/37375). + if (command_line.HasSwitch(switches::kLongLivedExtensions)) { + // Create status icons + StatusTrayManager* tray = g_browser_process->status_tray_manager(); + if (tray) + tray->Init(profile); + } +#endif + return true; } |