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

Side by Side Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.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 (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_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 void InitNativeWidget(const views::Widget::InitParams& params) override; 43 void InitNativeWidget(const views::Widget::InitParams& params) override;
44 44
45 // Overridden from NativeBrowserFrame: 45 // Overridden from NativeBrowserFrame:
46 views::Widget::InitParams GetWidgetParams() override; 46 views::Widget::InitParams GetWidgetParams() override;
47 bool UseCustomFrame() const override; 47 bool UseCustomFrame() const override;
48 bool UsesNativeSystemMenu() const override; 48 bool UsesNativeSystemMenu() const override;
49 int GetMinimizeButtonOffset() const override; 49 int GetMinimizeButtonOffset() const override;
50 bool ShouldSaveWindowPlacement() const override; 50 bool ShouldSaveWindowPlacement() const override;
51 void GetWindowPlacement(gfx::Rect* bounds, 51 void GetWindowPlacement(gfx::Rect* bounds,
52 ui::WindowShowState* show_state) const override; 52 ui::WindowShowState* show_state) const override;
53 bool PreHandleKeyboardEvent(
54 const content::NativeWebKeyboardEvent& event) override;
55 bool HandleKeyboardEvent(
56 const content::NativeWebKeyboardEvent& event) override;
53 57
54 private: 58 private:
55 // The BrowserView is our ClientView. This is a pointer to it. 59 // The BrowserView is our ClientView. This is a pointer to it.
56 BrowserView* browser_view_; 60 BrowserView* browser_view_;
57 BrowserFrame* browser_frame_; 61 BrowserFrame* browser_frame_;
58 62
59 // Owned by the RootWindow. 63 // Owned by the RootWindow.
60 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; 64 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_;
61 65
62 std::unique_ptr<wm::VisibilityController> visibility_controller_; 66 std::unique_ptr<wm::VisibilityController> visibility_controller_;
63 67
64 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); 68 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
65 }; 69 };
66 70
67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 71 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698