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

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

Issue 2832823002: Update avatar button to MD (Closed)
Patch Set: Rebased on CL 2833363002 Created 3 years, 8 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 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_NON_CLIENT_FRAME_VIEW_MUS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
13 #include "chrome/browser/ui/views/tab_icon_view_model.h" 13 #include "chrome/browser/ui/views/tab_icon_view_model.h"
14 #include "chrome/browser/ui/views/tabs/tab_strip_observer.h" 14 #include "chrome/browser/ui/views/tabs/tab_strip_observer.h"
15 #include "ui/views/controls/button/menu_button.h"
Peter Kasting 2017/04/26 02:09:53 Nit: Forward-declare rather than #include
emx 2017/04/27 16:30:58 Done.
15 16
16 #if !defined(OS_CHROMEOS) 17 #if !defined(OS_CHROMEOS)
17 #include "chrome/browser/ui/views/frame/avatar_button_manager.h" 18 #include "chrome/browser/ui/views/frame/avatar_button_manager.h"
18 #endif 19 #endif
19 20
20 class TabIconView; 21 class TabIconView;
21 22
22 class BrowserNonClientFrameViewMus : public BrowserNonClientFrameView, 23 class BrowserNonClientFrameViewMus : public BrowserNonClientFrameView,
23 public TabIconViewModel, 24 public TabIconViewModel,
24 public TabStripObserver { 25 public TabStripObserver {
25 public: 26 public:
26 static const char kViewClassName[]; 27 static const char kViewClassName[];
27 28
28 BrowserNonClientFrameViewMus(BrowserFrame* frame, BrowserView* browser_view); 29 BrowserNonClientFrameViewMus(BrowserFrame* frame, BrowserView* browser_view);
29 ~BrowserNonClientFrameViewMus() override; 30 ~BrowserNonClientFrameViewMus() override;
30 31
31 void Init(); 32 void Init();
32 33
33 // BrowserNonClientFrameView: 34 // BrowserNonClientFrameView:
34 void OnBrowserViewInitViewsComplete() override; 35 void OnBrowserViewInitViewsComplete() override;
35 gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; 36 gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
36 int GetTopInset(bool restored) const override; 37 int GetTopInset(bool restored) const override;
37 int GetThemeBackgroundXInset() const override; 38 int GetThemeBackgroundXInset() const override;
38 void UpdateThrobber(bool running) override; 39 void UpdateThrobber(bool running) override;
39 views::View* GetProfileSwitcherView() const override; 40 views::MenuButton* GetProfileSwitcherButton() const override;
40 void UpdateClientArea() override; 41 void UpdateClientArea() override;
41 42
42 // views::NonClientFrameView: 43 // views::NonClientFrameView:
43 gfx::Rect GetBoundsForClientView() const override; 44 gfx::Rect GetBoundsForClientView() const override;
44 gfx::Rect GetWindowBoundsForClientBounds( 45 gfx::Rect GetWindowBoundsForClientBounds(
45 const gfx::Rect& client_bounds) const override; 46 const gfx::Rect& client_bounds) const override;
46 int NonClientHitTest(const gfx::Point& point) override; 47 int NonClientHitTest(const gfx::Point& point) override;
47 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override; 48 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
48 void ResetWindowControls() override; 49 void ResetWindowControls() override;
49 void UpdateWindowIcon() override; 50 void UpdateWindowIcon() override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // Wrapper around the in-frame avatar switcher. 111 // Wrapper around the in-frame avatar switcher.
111 AvatarButtonManager profile_switcher_; 112 AvatarButtonManager profile_switcher_;
112 #endif 113 #endif
113 114
114 TabStrip* tab_strip_; 115 TabStrip* tab_strip_;
115 116
116 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMus); 117 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMus);
117 }; 118 };
118 119
119 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_ 120 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698