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

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

Issue 8356028: Add shortcut to show avatar menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build error Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.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/tab_icon_view.h" 12 #include "chrome/browser/ui/views/tab_icon_view.h"
13 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 #include "views/controls/button/button.h" 15 #include "views/controls/button/button.h"
16 #include "views/window/non_client_view.h" 16 #include "views/window/non_client_view.h"
17 17
18 class BrowserView; 18 class BrowserView;
19 namespace gfx { 19 namespace gfx {
20 class Font; 20 class Font;
21 } 21 }
22 class AvatarMenuButton;
23 class TabContents; 22 class TabContents;
24 namespace views { 23 namespace views {
25 class ImageButton; 24 class ImageButton;
26 class ImageView; 25 class ImageView;
27 } 26 }
28 27
29 class OpaqueBrowserFrameView : public BrowserNonClientFrameView, 28 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
30 public content::NotificationObserver, 29 public content::NotificationObserver,
31 public views::ButtonListener, 30 public views::ButtonListener,
32 public TabIconView::TabIconViewModel { 31 public TabIconView::TabIconViewModel {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // Overridden from views::NonClientFrameView: 74 // Overridden from views::NonClientFrameView:
76 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 75 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
77 virtual gfx::Rect GetWindowBoundsForClientBounds( 76 virtual gfx::Rect GetWindowBoundsForClientBounds(
78 const gfx::Rect& client_bounds) const OVERRIDE; 77 const gfx::Rect& client_bounds) const OVERRIDE;
79 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 78 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
80 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 79 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
81 OVERRIDE; 80 OVERRIDE;
82 virtual void EnableClose(bool enable) OVERRIDE; 81 virtual void EnableClose(bool enable) OVERRIDE;
83 virtual void ResetWindowControls() OVERRIDE; 82 virtual void ResetWindowControls() OVERRIDE;
84 virtual void UpdateWindowIcon() OVERRIDE; 83 virtual void UpdateWindowIcon() OVERRIDE;
84 virtual AvatarMenuButton* GetAvatarMenuButton() OVERRIDE;
85 85
86 // Overridden from views::View: 86 // Overridden from views::View:
87 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 87 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
88 virtual void Layout() OVERRIDE; 88 virtual void Layout() OVERRIDE;
89 virtual bool HitTest(const gfx::Point& l) const OVERRIDE; 89 virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
90 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 90 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
91 91
92 // Overridden from views::ButtonListener: 92 // Overridden from views::ButtonListener:
93 virtual void ButtonPressed(views::Button* sender, const views::Event& event) 93 virtual void ButtonPressed(views::Button* sender, const views::Event& event)
94 OVERRIDE; 94 OVERRIDE;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 // Menu button that displays that either the incognito icon or the profile 186 // Menu button that displays that either the incognito icon or the profile
187 // icon. 187 // icon.
188 scoped_ptr<AvatarMenuButton> avatar_button_; 188 scoped_ptr<AvatarMenuButton> avatar_button_;
189 189
190 content::NotificationRegistrar registrar_; 190 content::NotificationRegistrar registrar_;
191 191
192 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 192 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
193 }; 193 };
194 194
195 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 195 #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