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

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

Issue 234583008: Revert 263262 "Newly created profiles should have the grey silho..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 bool IsGuestSession() const; 199 bool IsGuestSession() const;
200 200
201 // Returns true if the profile associated with this Browser window is 201 // Returns true if the profile associated with this Browser window is
202 // not off the record or a guest session. 202 // not off the record or a guest session.
203 bool IsRegularOrGuestSession() const; 203 bool IsRegularOrGuestSession() const;
204 204
205 // Returns the resource ID to use for the OTR icon, which depends on 205 // Returns the resource ID to use for the OTR icon, which depends on
206 // which layout is being shown and whether we are full-screen. 206 // which layout is being shown and whether we are full-screen.
207 int GetOTRIconResourceID() const; 207 int GetOTRIconResourceID() const;
208 208
209 // Returns the resource ID to use for the Guest icon, which may depend on
210 // which layout is being shown and whether we are full-screen.
211 int GetGuestIconResourceID() const;
212
209 // Returns true if the non-client view should render an avatar icon. 213 // Returns true if the non-client view should render an avatar icon.
210 bool ShouldShowAvatar() const; 214 bool ShouldShowAvatar() const;
211 215
212 // Provides the containing frame with the accelerator for the specified 216 // Provides the containing frame with the accelerator for the specified
213 // command id. This can be used to provide menu item shortcut hints etc. 217 // command id. This can be used to provide menu item shortcut hints etc.
214 // Returns true if an accelerator was found for the specified |cmd_id|, false 218 // Returns true if an accelerator was found for the specified |cmd_id|, false
215 // otherwise. 219 // otherwise.
216 bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator); 220 bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
217 221
218 // Returns true if the specificed |accelerator| is registered with this view. 222 // Returns true if the specificed |accelerator| is registered with this view.
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 gfx::ScopedSysColorChangeListener color_change_listener_; 745 gfx::ScopedSysColorChangeListener color_change_listener_;
742 746
743 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 747 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
744 748
745 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 749 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
746 750
747 DISALLOW_COPY_AND_ASSIGN(BrowserView); 751 DISALLOW_COPY_AND_ASSIGN(BrowserView);
748 }; 752 };
749 753
750 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 754 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698