chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc - Issue 9703026: Makes the maximize/restore button handling

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/browser_non_client_frame_view_aura.cc

Issue 9703026: Makes the maximize/restore button handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleanup Created 8 years, 9 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

« ash/wm/workspace/frame_maximize_button.h ('K') | « chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc ('k') | ui/views/controls/button/image_button.h » ('j') | ui/views/controls/button/image_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc

index 3bcca0c45d4f8014ff611326bba19561dbe6f4d0..16def5252cc5ab05a4c2d23a3a0fb07d6cacf84d 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc

@@ -5,6 +5,7 @@

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

#include "ash/wm/frame_painter.h"

+#include "ash/wm/workspace/frame_maximize_button.h"

#include "chrome/browser/themes/theme_service.h"

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

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

@@ -52,7 +53,7 @@ BrowserNonClientFrameViewAura::~BrowserNonClientFrameViewAura() {

void BrowserNonClientFrameViewAura::Init() {

// Caption buttons.

- maximize_button_ = new views::ImageButton(this);

+ maximize_button_ = new ash::FrameMaximizeButton(this);

maximize_button_->SetAccessibleName(

l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE));

AddChildView(maximize_button_);