chrome/browser/ui/views/fullscreen_exit_bubble_views.cc - Issue 10914231: Map fullscreen button to maximize

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

Issue 10914231: Map fullscreen button to maximize (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fix for review issues Created 8 years, 3 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:

Index: chrome/browser/ui/views/fullscreen_exit_bubble_views.cc

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

index 760c2de398ddf30763e4aedbe9cbb916ed919724..e2cd74aecffc95313e329f55f65437970120f9ee 100644

--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc

+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc

@@ -255,11 +255,15 @@ FullscreenExitBubbleViews::FullscreenExitBubbleViews(

size_animation_->Reset(1);

// Create the contents view.

+#if defined(OS_CHROMEOS)

+ view_ = new FullscreenExitView(this, string16(), url, bubble_type_);

+#else

ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);

bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator);

DCHECK(got_accelerator);

view_ = new FullscreenExitView(

this, accelerator.GetShortcutText(), url, bubble_type_);

+#endif

// TODO(yzshen): Change to use the new views bubble, BubbleDelegateView.

// Initialize the popup.