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

Unified Diff: chrome/browser/ui/cocoa/system_hotkey_map.h

Issue 408973002: mac: Load the system hotkeys after launch. (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add more unit tests. Created 6 years, 5 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 | « no previous file | chrome/browser/ui/cocoa/system_hotkey_map.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/system_hotkey_map.h
diff --git a/chrome/browser/ui/cocoa/system_hotkey_map.h b/chrome/browser/ui/cocoa/system_hotkey_map.h
deleted file mode 100644
index 1c3f9312d0348789812338b41002250f7b6f963d..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/system_hotkey_map.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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 CHROME_BROWSER_UI_COCOA_SYSTEM_HOTKEY_MAP_H_
-#define CHROME_BROWSER_UI_COCOA_SYSTEM_HOTKEY_MAP_H_
-
-#import <Foundation/Foundation.h>
-#include <vector>
-
-#include "base/macros.h"
-
-struct SystemHotkey;
-
-// Maintains a listing of all OSX user modifiable hotkeys. e.g. (cmd + `)
-class SystemHotkeyMap {
- public:
- SystemHotkeyMap();
- ~SystemHotkeyMap();
-
- // Parses the property list data commonly stored at
- // ~/Library/Preferences/com.apple.symbolichotkeys.plist
- // Returns false on encountering an irrecoverable error.
- // Can be called multiple times. Only the results from the most recent
- // invocation are stored.
- bool ParseData(NSData* data);
-
- // Whether the hotkey has been reserved by the user.
- bool IsHotkeyReserved(int key_code, int modifiers);
-
- private:
- // Create at least one record of a hotkey that is reserved by the user.
- // Certain system hotkeys automatically reserve multiple key combinations.
- void ReserveHotkey(int key_code, int modifiers, NSString* system_effect);
-
- // Create a record of a hotkey that is reserved by the user.
- void ReserveHotkey(int key_code, int modifiers);
-
- std::vector<SystemHotkey> system_hotkeys_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemHotkeyMap);
-};
-
-#endif // CHROME_BROWSER_UI_COCOA_SYSTEM_HOTKEY_MAP_H_
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/system_hotkey_map.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698