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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_mac.h

Issue 2074643003: MacViews: Views accelerators table should match the Cocoa one. (Closed) Base URL: ssh://bitbucket.browser.yandex-team.ru/chromium/src.git@master
Patch Set: GetWindowKeyboardShortcutTable is now shared between Cocoa and MacViews. Created 4 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_BROWSER_FRAME_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_
7 7
8 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 8 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
9 9
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
(...skipping 17 matching lines...) Expand all
28 int SheetPositionY() override; 28 int SheetPositionY() override;
29 void InitNativeWidget(const views::Widget::InitParams& params) override; 29 void InitNativeWidget(const views::Widget::InitParams& params) override;
30 30
31 // Overridden from NativeBrowserFrame: 31 // Overridden from NativeBrowserFrame:
32 views::Widget::InitParams GetWidgetParams() override; 32 views::Widget::InitParams GetWidgetParams() override;
33 bool UseCustomFrame() const override; 33 bool UseCustomFrame() const override;
34 bool UsesNativeSystemMenu() const override; 34 bool UsesNativeSystemMenu() const override;
35 bool ShouldSaveWindowPlacement() const override; 35 bool ShouldSaveWindowPlacement() const override;
36 void GetWindowPlacement(gfx::Rect* bounds, 36 void GetWindowPlacement(gfx::Rect* bounds,
37 ui::WindowShowState* show_state) const override; 37 ui::WindowShowState* show_state) const override;
38 bool PreHandleKeyboardEvent(
39 const content::NativeWebKeyboardEvent& event) override;
40 bool HandleKeyboardEvent(
41 const content::NativeWebKeyboardEvent& event) override;
38 42
39 protected: 43 protected:
40 ~BrowserFrameMac() override; 44 ~BrowserFrameMac() override;
41 45
42 // Overridden from views::NativeWidgetMac: 46 // Overridden from views::NativeWidgetMac:
43 NativeWidgetMacNSWindow* CreateNSWindow( 47 NativeWidgetMacNSWindow* CreateNSWindow(
44 const views::Widget::InitParams& params) override; 48 const views::Widget::InitParams& params) override;
45 49
46 // Overridden from NativeBrowserFrame: 50 // Overridden from NativeBrowserFrame:
47 int GetMinimizeButtonOffset() const override; 51 int GetMinimizeButtonOffset() const override;
48 52
49 private: 53 private:
50 BrowserView* browser_view_; // Weak. Our ClientView. 54 BrowserView* browser_view_; // Weak. Our ClientView.
51 base::scoped_nsobject<ChromeCommandDispatcherDelegate> 55 base::scoped_nsobject<ChromeCommandDispatcherDelegate>
52 command_dispatcher_delegate_; 56 command_dispatcher_delegate_;
53 57
54 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMac); 58 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMac);
55 }; 59 };
56 60
57 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_ 61 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698