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

Unified Diff: chrome/browser/browser_init.cc

Issue 661454: Initial implementation of status tray functionality (mac-only, currently). (Closed)
Patch Set: more changes per review feedback Created 10 years, 10 months 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/browser.cc ('k') | chrome/browser/browser_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_init.cc
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index fe1866f7b73cbac2bf131791fe8a1a9d990e06b6..9f92ad816064d0f16bd9d576d39414c284178ae7 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;
}
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/browser_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698