mac: Load the system hotkeys after launch.

chrome/browser/ui/browser.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 191 matching lines @@
 #endif  // OS_WIN
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #endif
 
 #if defined(USE_ASH)
 #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;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::PluginService;
 using content::Referrer;
 using content::RenderWidgetHostView;
 using content::SiteInstance;
@@ skipping 215 matching lines @@
   // TODO(beng): move to ChromeBrowserMain:
   if (first_run::ShouldDoPersonalDataManagerFirstRun()) {
 #if defined(OS_WIN)
     // Notify PDM that this is a first run.
     ImportAutofillDataWin(
         autofill::PersonalDataManagerFactory::GetForProfile(profile_));
 #endif  // defined(OS_WIN)
   }
 
   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() {
   // Stop observing notifications before continuing with destruction. Profile
   // destruction will unload extensions and reentrant calls to Browser:: should
   // be avoided while it is being torn down.
   registrar_.RemoveAll();
 
   // The tab strip should not have any tabs at this point.
   DCHECK(tab_strip_model_->empty());
@@ skipping 1965 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }