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

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: 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:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698