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

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

Issue 2578893003: Converts chrome to aura-mus (Closed)
Patch Set: merge again Created 4 years 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/widget/desktop_aura/desktop_native_widget_aura.h"
11 11
12 class BrowserFrame;
12 class BrowserView; 13 class BrowserView;
13 14
14 class BrowserFrameMus : public NativeBrowserFrame, 15 class BrowserFrameMus : public NativeBrowserFrame,
15 public views::NativeWidgetMus { 16 public views::DesktopNativeWidgetAura {
16 public: 17 public:
17 BrowserFrameMus(BrowserFrame* browser_frame, BrowserView* browser_view); 18 BrowserFrameMus(BrowserFrame* browser_frame, BrowserView* browser_view);
18 ~BrowserFrameMus() override; 19 ~BrowserFrameMus() override;
19 20
20 ui::Window* mus_window();
21
22 private: 21 private:
23 // Overridden from NativeBrowserFrame: 22 // Overridden from NativeBrowserFrame:
24 views::Widget::InitParams GetWidgetParams() override; 23 views::Widget::InitParams GetWidgetParams() override;
25 bool UseCustomFrame() const override; 24 bool UseCustomFrame() const override;
26 bool UsesNativeSystemMenu() const override; 25 bool UsesNativeSystemMenu() const override;
27 bool ShouldSaveWindowPlacement() const override; 26 bool ShouldSaveWindowPlacement() const override;
28 void GetWindowPlacement(gfx::Rect* bounds, 27 void GetWindowPlacement(gfx::Rect* bounds,
29 ui::WindowShowState* show_state) const override; 28 ui::WindowShowState* show_state) const override;
30 bool PreHandleKeyboardEvent( 29 bool PreHandleKeyboardEvent(
31 const content::NativeWebKeyboardEvent& event) override; 30 const content::NativeWebKeyboardEvent& event) override;
32 bool HandleKeyboardEvent( 31 bool HandleKeyboardEvent(
33 const content::NativeWebKeyboardEvent& event) override; 32 const content::NativeWebKeyboardEvent& event) override;
34 int GetMinimizeButtonOffset() const override; 33 int GetMinimizeButtonOffset() const override;
35 34
36 // Overriden from NativeWidgetMus: 35 BrowserFrame* browser_frame_;
37 void UpdateClientArea() override;
38
39 BrowserView* browser_view_; 36 BrowserView* browser_view_;
40 37
41 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMus); 38 DISALLOW_COPY_AND_ASSIGN(BrowserFrameMus);
42 }; 39 };
43 40
44 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_ 41 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698