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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_mus.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MUS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 9 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
10 #include "ui/views/mus/native_widget_mus.h" 10 #include "ui/views/mus/native_widget_mus.h"
11 11
12 class BrowserFrameMus : public NativeBrowserFrame, 12 class BrowserFrameMus : public NativeBrowserFrame,
13 public views::NativeWidgetMus { 13 public views::NativeWidgetMus {
14 public: 14 public:
15 BrowserFrameMus(BrowserFrame* browser_frame, BrowserView* browser_view); 15 BrowserFrameMus(BrowserFrame* browser_frame, BrowserView* browser_view);
16 ~BrowserFrameMus() override; 16 ~BrowserFrameMus() override;
17 17
18 ui::Window* mus_window(); 18 ui::Window* mus_window();
19 19
20 private: 20 private:
21 // Overridden from NativeBrowserFrame: 21 // Overridden from NativeBrowserFrame:
22 views::Widget::InitParams GetWidgetParams() override; 22 views::Widget::InitParams GetWidgetParams() override;
23 bool UseCustomFrame() const override; 23 bool UseCustomFrame() const override;
24 bool UsesNativeSystemMenu() const override; 24 bool UsesNativeSystemMenu() const override;
25 bool ShouldSaveWindowPlacement() const override; 25 bool ShouldSaveWindowPlacement() const override;
26 void GetWindowPlacement(gfx::Rect* bounds, 26 void GetWindowPlacement(gfx::Rect* bounds,
27 ui::WindowShowState* show_state) const override; 27 ui::WindowShowState* show_state) const override;
28 bool PreHandleKeyboardEvent(
29 const content::NativeWebKeyboardEvent& event) override;
30 bool HandleKeyboardEvent(
31 const content::NativeWebKeyboardEvent& event) override;
28 int GetMinimizeButtonOffset() const override; 32 int GetMinimizeButtonOffset() const override;
29 33
30 // Overriden from NativeWidgetMus: 34 // Overriden from NativeWidgetMus:
31 void UpdateClientArea() override; 35 void UpdateClientArea() override;
32 36
33 BrowserView* browser_view_; 37 BrowserView* browser_view_;
34 38
35 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMus); 39 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMus);
36 }; 40 };
37 41
38 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_ 42 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698