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

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

Issue 1259513002: [MacViews] Use ChromeCommandDispatcherDelegate to handle keyboard shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@commandexecute
Patch Set: Address comments. Created 5 years, 3 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 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
10 #import "base/mac/scoped_nsobject.h"
9 #include "ui/views/widget/native_widget_mac.h" 11 #include "ui/views/widget/native_widget_mac.h"
10 12
11 class BrowserFrame; 13 class BrowserFrame;
12 class BrowserView; 14 class BrowserView;
15 @class ChromeCommandDispatcherDelegate;
13 16
14 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
15 // BrowserFrameMac is a NativeWidgetMac subclass that provides 18 // BrowserFrameMac is a NativeWidgetMac subclass that provides
16 // the window frame for the Chrome browser window. 19 // the window frame for the Chrome browser window.
17 // 20 //
18 class BrowserFrameMac : public views::NativeWidgetMac, 21 class BrowserFrameMac : public views::NativeWidgetMac,
19 public NativeBrowserFrame { 22 public NativeBrowserFrame {
20 public: 23 public:
21 BrowserFrameMac(BrowserFrame* browser_frame, BrowserView* browser_view); 24 BrowserFrameMac(BrowserFrame* browser_frame, BrowserView* browser_view);
22 25
23 // Overridden from views::NativeWidgetMac: 26 // Overridden from views::NativeWidgetMac:
24 void OnWindowWillClose() override; 27 void OnWindowWillClose() override;
25 void InitNativeWidget(const views::Widget::InitParams& params) override; 28 void InitNativeWidget(const views::Widget::InitParams& params) override;
26 29
27 // Overridden from NativeBrowserFrame: 30 // Overridden from NativeBrowserFrame:
28 views::Widget::InitParams GetWidgetParams() override; 31 views::Widget::InitParams GetWidgetParams() override;
29 bool UseCustomFrame() const override; 32 bool UseCustomFrame() const override;
30 bool UsesNativeSystemMenu() const override; 33 bool UsesNativeSystemMenu() const override;
31 bool ShouldSaveWindowPlacement() const override; 34 bool ShouldSaveWindowPlacement() const override;
32 void GetWindowPlacement(gfx::Rect* bounds, 35 void GetWindowPlacement(gfx::Rect* bounds,
33 ui::WindowShowState* show_state) const override; 36 ui::WindowShowState* show_state) const override;
34 37
35 protected: 38 protected:
36 ~BrowserFrameMac() override; 39 ~BrowserFrameMac() override;
37 40
38 // Overridden from views::NativeWidgetMac: 41 // Overridden from views::NativeWidgetMac:
39 gfx::NativeWindow CreateNSWindow( 42 NativeWidgetMacNSWindow* CreateNSWindow(
40 const views::Widget::InitParams& params) override; 43 const views::Widget::InitParams& params) override;
41 44
42 // Overridden from NativeBrowserFrame: 45 // Overridden from NativeBrowserFrame:
43 int GetMinimizeButtonOffset() const override; 46 int GetMinimizeButtonOffset() const override;
44 47
45 private: 48 private:
46 BrowserView* browser_view_; // Weak. Our ClientView. 49 BrowserView* browser_view_; // Weak. Our ClientView.
50 base::scoped_nsobject<ChromeCommandDispatcherDelegate>
51 command_dispatcher_delegate_;
47 52
48 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMac); 53 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMac);
49 }; 54 };
50 55
51 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_ 56 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/apps/app_window_native_widget_mac.mm ('k') | chrome/browser/ui/views/frame/browser_frame_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698