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

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

Issue 1250403002: [Mac] Move UI item validation to UserInterfaceItemCommandHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@commandexecute
Patch Set: Split out BrowserWindowCommandHandler and only use it in browser windows. 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 9
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
11 #include "ui/views/widget/native_widget_mac.h" 11 #include "ui/views/widget/native_widget_mac.h"
12 12
13 class BrowserFrame; 13 class BrowserFrame;
14 class BrowserView; 14 class BrowserView;
15 @class BrowserWindowCommandHandler;
15 @class ChromeCommandDispatcherDelegate; 16 @class ChromeCommandDispatcherDelegate;
16 17
17 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
18 // BrowserFrameMac is a NativeWidgetMac subclass that provides 19 // BrowserFrameMac is a NativeWidgetMac subclass that provides
19 // the window frame for the Chrome browser window. 20 // the window frame for the Chrome browser window.
20 // 21 //
21 class BrowserFrameMac : public views::NativeWidgetMac, 22 class BrowserFrameMac : public views::NativeWidgetMac,
22 public NativeBrowserFrame { 23 public NativeBrowserFrame {
23 public: 24 public:
24 BrowserFrameMac(BrowserFrame* browser_frame, BrowserView* browser_view); 25 BrowserFrameMac(BrowserFrame* browser_frame, BrowserView* browser_view);
(...skipping 18 matching lines...) Expand all
43 NativeWidgetMacNSWindow* CreateNSWindow( 44 NativeWidgetMacNSWindow* CreateNSWindow(
44 const views::Widget::InitParams& params) override; 45 const views::Widget::InitParams& params) override;
45 46
46 // Overridden from NativeBrowserFrame: 47 // Overridden from NativeBrowserFrame:
47 int GetMinimizeButtonOffset() const override; 48 int GetMinimizeButtonOffset() const override;
48 49
49 private: 50 private:
50 BrowserView* browser_view_; // Weak. Our ClientView. 51 BrowserView* browser_view_; // Weak. Our ClientView.
51 base::scoped_nsobject<ChromeCommandDispatcherDelegate> 52 base::scoped_nsobject<ChromeCommandDispatcherDelegate>
52 command_dispatcher_delegate_; 53 command_dispatcher_delegate_;
54 base::scoped_nsobject<BrowserWindowCommandHandler> command_handler_;
53 55
54 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMac); 56 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMac);
55 }; 57 };
56 58
57 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_ 59 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698