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

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

Issue 24647003: Redesign of the avatar menu button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix for app/popup browser crash Created 7 years, 2 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_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 return fullscreen_bubble_.get(); 185 return fullscreen_bubble_.get();
186 } 186 }
187 187
188 // Returns true if various window components are visible. 188 // Returns true if various window components are visible.
189 bool IsTabStripVisible() const; 189 bool IsTabStripVisible() const;
190 190
191 // Returns true if the profile associated with this Browser window is 191 // Returns true if the profile associated with this Browser window is
192 // incognito. 192 // incognito.
193 bool IsOffTheRecord() const; 193 bool IsOffTheRecord() const;
194 194
195 // Returns true if the profile associated with this Browser window is
196 // a guest session.
197 bool IsGuestSession() const;
198
199 // Returns true if the profile associated with this Browser window is
200 // not off the record or a guest session.
201 bool IsRegularOrGuestSession() const;
202
195 // Returns the resource ID to use for the OTR icon, which depends on 203 // Returns the resource ID to use for the OTR icon, which depends on
196 // which layout is being shown and whether we are full-screen. 204 // which layout is being shown and whether we are full-screen.
197 int GetOTRIconResourceID() const; 205 int GetOTRIconResourceID() const;
198 206
199 // Returns true if the profile associated with this Browser window is
200 // a guest session.
201 bool IsGuestSession() const;
202
203 // Returns the resource ID to use for the Guest icon, which may depend on 207 // Returns the resource ID to use for the Guest icon, which may depend on
204 // which layout is being shown and whether we are full-screen. 208 // which layout is being shown and whether we are full-screen.
205 int GetGuestIconResourceID() const; 209 int GetGuestIconResourceID() const;
206 210
207 // Returns true if the non-client view should render an avatar icon. 211 // Returns true if the non-client view should render an avatar icon.
208 bool ShouldShowAvatar() const; 212 bool ShouldShowAvatar() const;
209 213
210 // Provides the containing frame with the accelerator for the specified 214 // Provides the containing frame with the accelerator for the specified
211 // command id. This can be used to provide menu item shortcut hints etc. 215 // command id. This can be used to provide menu item shortcut hints etc.
212 // Returns true if an accelerator was found for the specified |cmd_id|, false 216 // Returns true if an accelerator was found for the specified |cmd_id|, false
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 748 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
745 749
746 gfx::ScopedSysColorChangeListener color_change_listener_; 750 gfx::ScopedSysColorChangeListener color_change_listener_;
747 751
748 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 752 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
749 753
750 DISALLOW_COPY_AND_ASSIGN(BrowserView); 754 DISALLOW_COPY_AND_ASSIGN(BrowserView);
751 }; 755 };
752 756
753 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 757 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698