mac: Load the system hotkeys after launch.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index db19aee5d85607283b8c7f1bf17e173b15e94a7a..fc182f9671f0f66d97d44df88010140354750db0 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -209,6 +209,10 @@
 #include "ash/ash_switches.h"
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+#include "chrome/browser/ui/cocoa/system_hotkey_helper_mac.h"
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
 using base::TimeDelta;
 using base::UserMetricsAction;
 using content::NativeWebKeyboardEvent;
@@ -444,6 +448,11 @@ Browser::Browser(const CreateParams& params)
   }
 
   fullscreen_controller_.reset(new FullscreenController(this));
+
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  // Load system hotkeys on OSX.
+  SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)

[Avi (use Gerrit), 2014/07/07 21:57:49]

But this isn't a per-Browser thing, this is a system-wide thing.

[erikchen, 2014/07/08 01:51:39]

I didn't realize that more than 1 Chrome browser is created. When would a second
browser be created?

I've moved all the code to content/ to mirror your ThemeHelperMac CL. 

[Avi (use Gerrit), 2014/07/08 02:04:19]

I don't have time for a full review right now (I'll look at it tomorrow) but
FYI, each Chrome window open has a Browser object. Every time you hit command-N
you get another one.

 }
 
 Browser::~Browser() {