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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Fix Mac Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEWS_H _ 5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEWS_H _
6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEWS_H _ 6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEWS_H _
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 29 matching lines...) Expand all
40 // Overridden from ui::AcceleratorTarget. 40 // Overridden from ui::AcceleratorTarget.
41 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; 41 bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
42 bool CanHandleAccelerators() const override; 42 bool CanHandleAccelerators() const override;
43 43
44 private: 44 private:
45 // Overridden from ExtensionKeybindingRegistry: 45 // Overridden from ExtensionKeybindingRegistry:
46 void AddExtensionKeybindings(const extensions::Extension* extension, 46 void AddExtensionKeybindings(const extensions::Extension* extension,
47 const std::string& command_name) override; 47 const std::string& command_name) override;
48 void RemoveExtensionKeybindingImpl(const ui::Accelerator& accelerator, 48 void RemoveExtensionKeybindingImpl(const ui::Accelerator& accelerator,
49 const std::string& command_name) override; 49 const std::string& command_name) override;
50 void OnShortcutHandlingSuspended(bool suspended) override;
50 51
51 // Weak pointer to the our profile. Not owned by us. 52 // Weak pointer to the our profile. Not owned by us.
52 Profile* profile_; 53 Profile* profile_;
53 54
54 // Weak pointer back to the focus manager to use to register and unregister 55 // Weak pointer back to the focus manager to use to register and unregister
55 // accelerators with. Not owned by us. 56 // accelerators with. Not owned by us.
56 views::FocusManager* focus_manager_; 57 views::FocusManager* focus_manager_;
57 58
58 // The content notification registrar for listening to extension events. 59 // The content notification registrar for listening to extension events.
59 content::NotificationRegistrar registrar_; 60 content::NotificationRegistrar registrar_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistryViews); 62 DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistryViews);
62 }; 63 };
63 64
64 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEW S_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_VIEW S_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698