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

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

Issue 2273863002: Revert of Refactor DoesIntersectRect into BrowserNonClientFrameView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 private: 79 private:
80 ui::Window* mus_window(); 80 ui::Window* mus_window();
81 81
82 // Resets the client area on the ui::Window. 82 // Resets the client area on the ui::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;
88 88
89 // views::NonClientFrameView:
90 bool DoesIntersectRect(const views::View* target,
91 const gfx::Rect& rect) const override;
92
89 // Distance between the left edge of the NonClientFrameView and the tab strip. 93 // Distance between the left edge of the NonClientFrameView and the tab strip.
90 int GetTabStripLeftInset() const; 94 int GetTabStripLeftInset() const;
91 95
92 // Distance between the right edge of the NonClientFrameView and the tab 96 // Distance between the right edge of the NonClientFrameView and the tab
93 // strip. 97 // strip.
94 int GetTabStripRightInset() const; 98 int GetTabStripRightInset() const;
95 99
96 // Returns true if we should use a super short header with light bars instead 100 // Returns true if we should use a super short header with light bars instead
97 // of regular tabs. This header is used in immersive fullscreen when the 101 // of regular tabs. This header is used in immersive fullscreen when the
98 // top-of-window views are not revealed. 102 // top-of-window views are not revealed.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Wrapper around the in-frame avatar switcher. 141 // Wrapper around the in-frame avatar switcher.
138 AvatarButtonManager profile_switcher_; 142 AvatarButtonManager profile_switcher_;
139 #endif 143 #endif
140 144
141 TabStrip* tab_strip_; 145 TabStrip* tab_strip_;
142 146
143 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMus); 147 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewMus);
144 }; 148 };
145 149
146 #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