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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_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, 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_BROWSER_NON_CLIENT_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
7 7
8 #include "chrome/browser/profiles/profile_attributes_storage.h" 8 #include "chrome/browser/profiles/profile_attributes_storage.h"
9 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" 9 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 93 }
94 views::View* profile_indicator_icon() { 94 views::View* profile_indicator_icon() {
95 return profile_indicator_icon_; 95 return profile_indicator_icon_;
96 } 96 }
97 97
98 private: 98 private:
99 // views::NonClientFrameView: 99 // views::NonClientFrameView:
100 void ViewHierarchyChanged( 100 void ViewHierarchyChanged(
101 const ViewHierarchyChangedDetails& details) override; 101 const ViewHierarchyChangedDetails& details) override;
102 void ActivationChanged(bool active) override; 102 void ActivationChanged(bool active) override;
103 bool DoesIntersectRect(const views::View* target,
104 const gfx::Rect& rect) const override;
105 103
106 // ProfileAttributesStorage::Observer: 104 // ProfileAttributesStorage::Observer:
107 void OnProfileAdded(const base::FilePath& profile_path) override; 105 void OnProfileAdded(const base::FilePath& profile_path) override;
108 void OnProfileWasRemoved(const base::FilePath& profile_path, 106 void OnProfileWasRemoved(const base::FilePath& profile_path,
109 const base::string16& profile_name) override; 107 const base::string16& profile_name) override;
110 void OnProfileAvatarChanged(const base::FilePath& profile_path) override; 108 void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
111 109
112 // Gets a theme provider that should be non-null even before we're added to a 110 // Gets a theme provider that should be non-null even before we're added to a
113 // view hierarchy. 111 // view hierarchy.
114 const ui::ThemeProvider* GetThemeProviderForProfile() const; 112 const ui::ThemeProvider* GetThemeProviderForProfile() const;
(...skipping 16 matching lines...) Expand all
131 129
132 namespace chrome { 130 namespace chrome {
133 131
134 // Provided by a browser_non_client_frame_view_factory_*.cc implementation 132 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
135 BrowserNonClientFrameView* CreateBrowserNonClientFrameView( 133 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
136 BrowserFrame* frame, BrowserView* browser_view); 134 BrowserFrame* frame, BrowserView* browser_view);
137 135
138 } // namespace chrome 136 } // namespace chrome
139 137
140 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ 138 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698