mac: Load the system hotkeys after launch.

content/browser/cocoa/system_hotkey_helper_mac.h

Index: content/browser/cocoa/system_hotkey_helper_mac.h
diff --git a/content/browser/cocoa/system_hotkey_helper_mac.h b/content/browser/cocoa/system_hotkey_helper_mac.h
new file mode 100644
index 0000000000000000000000000000000000000000..dd684af64c38b0b4e1fd4586098d19e8a27c7df1
--- /dev/null
+++ b/content/browser/cocoa/system_hotkey_helper_mac.h
@@ -0,0 +1,56 @@
+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_HELPER_MAC_H_
+#define CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_HELPER_MAC_H_
+
+#include "base/memory/singleton.h"
+#include "base/memory/weak_ptr.h"
+
+#ifdef __OBJC__
+@class NSDictionary;
+#else
+class NSDictionary;
+#endif
+
+namespace content {
+
+class SystemHotkeyMap;
+
+class SystemHotkeyHelperMac {

[Robert Sesek, 2014/07/14 15:33:31]

Every class needs a class-level comment.

[erikchen, 2014/07/14 18:17:38]

Done.

+ public:
+  // Return pointer to the singleton instance for the current process.
+  static SystemHotkeyHelperMac* GetInstance();
+
+  // Loads the system hot keys after a brief delay, to reduce file system access
+  // immediately after launch.
+  void DeferredLoadSystemHotkeys();
+
+  // Guaranteed to not be NULL.
+  SystemHotkeyMap* map() { return map_.get(); }
+
+ private:
+  friend struct DefaultSingletonTraits<SystemHotkeyHelperMac>;
+
+  SystemHotkeyHelperMac();
+  virtual ~SystemHotkeyHelperMac();

[Robert Sesek, 2014/07/14 15:33:31]

Doesn't need to be virtual.

[erikchen, 2014/07/14 18:17:38]

Done.

+
+  // Must be called from the FILE thread. Loads the file containing the system
+  // hotkeys into a NSDictionary* object, and passes the result to FileDidLoad
+  // on the UI thread.
+  void LoadSystemHotkeys();
+
+  // Must be called from the UI thread. |dictionary| should have a retain count
+  // of +1. This method will release |dictionary|. Parses the system hotkeys
+  // from the plist stored in |dictionary|.
+  void FileDidLoad(NSDictionary* dictionary);

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

If you can express this with a parameter of scoped_nsobject<NSDictionary>
instead and make it work with the task posting, that would be preferable to
expressing the retain count semantics in the comment.

[Robert Sesek, 2014/07/14 15:33:31]

I'd just rephrase the comment to say "This takes ownership of the |dictionary|."

[erikchen, 2014/07/14 18:17:38]

I rephrased the comment as per rsesek's suggestion.

+
+  scoped_ptr<SystemHotkeyMap> map_;
+
+  DISALLOW_COPY_AND_ASSIGN(SystemHotkeyHelperMac);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_HELPER_MAC_H_