chrome/browser/ui/views/frame/glass_browser_frame_view.h - Issue 1608843002: Start untangling the avatar switcher from BrowserNonClientFrameView

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.h

Issue 1608843002: Start untangling the avatar switcher from BrowserNonClientFrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160119-MacViewsBrowser-Compile

Patch Set: rename, enum class Created 4 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/glass_browser_frame_view.h

diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h

index 0f21f184f6a629ae27e24d122234aac6869c943b..3ec08c477fc9dc1ec7337f7d7e2a26b8d4123881 100644

--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h

+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h

@@ -9,13 +9,11 @@

#include "base/macros.h"

#include "base/win/scoped_gdi_object.h"

#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"

-#include "ui/views/controls/button/button.h"

#include "ui/views/window/non_client_view.h"

class BrowserView;

-class GlassBrowserFrameView : public BrowserNonClientFrameView,

- public views::ButtonListener {

+class GlassBrowserFrameView : public BrowserNonClientFrameView {

public:

// Constructs a non-client view for an BrowserFrame.

GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);

@@ -44,9 +42,6 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,

void OnPaint(gfx::Canvas* canvas) override;

void Layout() override;

- // views::ButtonListener:

- void ButtonPressed(views::Button* sender, const ui::Event& event) override;

// BrowserNonClientFrameView:

void UpdateNewAvatarButtonImpl() override;