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

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

Issue 1972033002: Simplify some old avatar menu button code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reinstate ash browser test fix Created 4 years, 7 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"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const char* GetClassName() const override; 67 const char* GetClassName() const override;
68 void GetAccessibleState(ui::AXViewState* state) override; 68 void GetAccessibleState(ui::AXViewState* state) override;
69 gfx::Size GetMinimumSize() const override; 69 gfx::Size GetMinimumSize() const override;
70 70
71 // TabIconViewModel: 71 // TabIconViewModel:
72 bool ShouldTabIconViewAnimate() const override; 72 bool ShouldTabIconViewAnimate() const override;
73 gfx::ImageSkia GetFaviconForTabIconView() override; 73 gfx::ImageSkia GetFaviconForTabIconView() override;
74 74
75 protected: 75 protected:
76 // BrowserNonClientFrameView: 76 // BrowserNonClientFrameView:
77 void UpdateAvatar() override; 77 void UpdateProfileIcons() override;
78 78
79 private: 79 private:
80 mus::Window* mus_window(); 80 mus::Window* mus_window();
81 81
82 // Resets the client area on the mus::Window. 82 // Resets the client area on the mus::Window.
83 void UpdateClientArea(); 83 void UpdateClientArea();
84 84
85 // TabStripObserver: 85 // TabStripObserver:
86 void TabStripMaxXChanged(TabStrip* tab_strip) override; 86 void TabStripMaxXChanged(TabStrip* tab_strip) override;
87 void TabStripDeleted(TabStrip* tab_strip) override; 87 void TabStripDeleted(TabStrip* tab_strip) override;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // Wrapper around the in-frame avatar switcher. 141 // Wrapper around the in-frame avatar switcher.
142 AvatarButtonManager profile_switcher_; 142 AvatarButtonManager profile_switcher_;
143 #endif 143 #endif
144 144
145 TabStrip* tab_strip_; 145 TabStrip* tab_strip_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMus); 147 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMus);
148 }; 148 };
149 149
150 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_ 150 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698