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

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_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_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 "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/view_ids.h" 9 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/browser/ui/views/frame/browser_frame.h" 10 #include "chrome/browser/ui/views/frame/browser_frame.h"
11 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 11 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
12 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegat e.h" 12 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegat e.h"
13 #include "chrome/browser/ui/views/tab_icon_view_model.h" 13 #include "chrome/browser/ui/views/tab_icon_view_model.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
16 #include "ui/views/controls/button/button.h" 16 #include "ui/views/controls/button/button.h"
17 #include "ui/views/window/non_client_view.h" 17 #include "ui/views/window/non_client_view.h"
18 18
19 class BrowserView; 19 class BrowserView;
20 class OpaqueBrowserFrameViewLayout; 20 class OpaqueBrowserFrameViewLayout;
21 class OpaqueBrowserFrameViewPlatformSpecific; 21 class OpaqueBrowserFrameViewPlatformSpecific;
22 class TabIconView; 22 class TabIconView;
23 class NewAvatarButton;
23 24
24 namespace views { 25 namespace views {
25 class ImageButton; 26 class ImageButton;
26 class FrameBackground; 27 class FrameBackground;
27 class Label; 28 class Label;
28 } 29 }
29 30
30 class OpaqueBrowserFrameView : public BrowserNonClientFrameView, 31 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
31 public content::NotificationObserver, 32 public content::NotificationObserver,
32 public views::ButtonListener, 33 public views::ButtonListener,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const content::NotificationDetails& details) OVERRIDE; 81 const content::NotificationDetails& details) OVERRIDE;
81 82
82 // OpaqueBrowserFrameViewLayoutDelegate implementation: 83 // OpaqueBrowserFrameViewLayoutDelegate implementation:
83 virtual bool ShouldShowWindowIcon() const OVERRIDE; 84 virtual bool ShouldShowWindowIcon() const OVERRIDE;
84 virtual bool ShouldShowWindowTitle() const OVERRIDE; 85 virtual bool ShouldShowWindowTitle() const OVERRIDE;
85 virtual string16 GetWindowTitle() const OVERRIDE; 86 virtual string16 GetWindowTitle() const OVERRIDE;
86 virtual int GetIconSize() const OVERRIDE; 87 virtual int GetIconSize() const OVERRIDE;
87 virtual bool ShouldLeaveOffsetNearTopBorder() const OVERRIDE; 88 virtual bool ShouldLeaveOffsetNearTopBorder() const OVERRIDE;
88 virtual gfx::Size GetBrowserViewMinimumSize() const OVERRIDE; 89 virtual gfx::Size GetBrowserViewMinimumSize() const OVERRIDE;
89 virtual bool ShouldShowAvatar() const OVERRIDE; 90 virtual bool ShouldShowAvatar() const OVERRIDE;
91 virtual bool IsRegularOrGuestSession() const OVERRIDE;
90 virtual gfx::ImageSkia GetOTRAvatarIcon() const OVERRIDE; 92 virtual gfx::ImageSkia GetOTRAvatarIcon() const OVERRIDE;
91 virtual bool IsMaximized() const OVERRIDE; 93 virtual bool IsMaximized() const OVERRIDE;
92 virtual bool IsMinimized() const OVERRIDE; 94 virtual bool IsMinimized() const OVERRIDE;
93 virtual bool IsFullscreen() const OVERRIDE; 95 virtual bool IsFullscreen() const OVERRIDE;
94 virtual bool IsTabStripVisible() const OVERRIDE; 96 virtual bool IsTabStripVisible() const OVERRIDE;
95 virtual int GetTabStripHeight() const OVERRIDE; 97 virtual int GetTabStripHeight() const OVERRIDE;
96 virtual int GetAdditionalReservedSpaceInTabStrip() const OVERRIDE; 98 virtual int GetAdditionalReservedSpaceInTabStrip() const OVERRIDE;
97 virtual gfx::Size GetTabstripPreferredSize() const OVERRIDE; 99 virtual gfx::Size GetTabstripPreferredSize() const OVERRIDE;
98 100
99 private: 101 private:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // Background painter for the window frame. 160 // Background painter for the window frame.
159 scoped_ptr<views::FrameBackground> frame_background_; 161 scoped_ptr<views::FrameBackground> frame_background_;
160 162
161 // Observer that handles platform dependent configuration. 163 // Observer that handles platform dependent configuration.
162 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_; 164 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
163 165
164 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 166 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
165 }; 167 };
166 168
167 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 169 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698