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

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.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, 4 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 (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_OPAQUE_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 views::ImageButton* close_button() const { return close_button_; } 98 views::ImageButton* close_button() const { return close_button_; }
99 99
100 // views::View: 100 // views::View:
101 void OnPaint(gfx::Canvas* canvas) override; 101 void OnPaint(gfx::Canvas* canvas) override;
102 102
103 // BrowserNonClientFrameView: 103 // BrowserNonClientFrameView:
104 bool ShouldPaintAsThemed() const override; 104 bool ShouldPaintAsThemed() const override;
105 void UpdateProfileIcons() override; 105 void UpdateProfileIcons() override;
106 106
107 private: 107 private:
108 // views::NonClientFrameView:
109 bool DoesIntersectRect(const views::View* target,
110 const gfx::Rect& rect) const override;
111
108 // Creates, adds and returns a new image button with |this| as its listener. 112 // Creates, adds and returns a new image button with |this| as its listener.
109 // Memory is owned by the caller. 113 // Memory is owned by the caller.
110 views::ImageButton* InitWindowCaptionButton(int normal_image_id, 114 views::ImageButton* InitWindowCaptionButton(int normal_image_id,
111 int hot_image_id, 115 int hot_image_id,
112 int pushed_image_id, 116 int pushed_image_id,
113 int mask_image_id, 117 int mask_image_id,
114 int accessibility_string_id, 118 int accessibility_string_id,
115 ViewID view_id); 119 ViewID view_id);
116 120
117 // Returns the thickness of the border that makes up the window frame edges. 121 // Returns the thickness of the border that makes up the window frame edges.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // Background painter for the window frame. 174 // Background painter for the window frame.
171 std::unique_ptr<views::FrameBackground> frame_background_; 175 std::unique_ptr<views::FrameBackground> frame_background_;
172 176
173 // Observer that handles platform dependent configuration. 177 // Observer that handles platform dependent configuration.
174 std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_; 178 std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
175 179
176 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 180 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
177 }; 181 };
178 182
179 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 183 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698