diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 04:46:16 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 04:46:16 +0000 |
| commit | 184717d5b531004d810032185259cd866450e6fc (patch) | |
| tree | 5bce0951e033a1d5389b55a90c248a8be2820771 /chrome/browser/ui/views/fullscreen_exit_bubble_views.cc | |
| parent | d82a3c9fb4934389062ea22540d6af71234a846e (diff) | |
| download | chromium_src-184717d5b531004d810032185259cd866450e6fc.zip chromium_src-184717d5b531004d810032185259cd866450e6fc.tar.gz chromium_src-184717d5b531004d810032185259cd866450e6fc.tar.bz2 | |
Add FullscreenController::ToggleFullscreenModeWithExtension
Add a new method
Remove unused argument |for_tab|, it is only used inside fullscreen_controller.cc
BUG=112782
TEST=build success
Review URL: http://codereview.chromium.org/9353010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/fullscreen_exit_bubble_views.cc')
| -rw-r--r-- | chrome/browser/ui/views/fullscreen_exit_bubble_views.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 1631012..d738ba26 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -218,7 +218,8 @@ void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent( } else { bool link_visible = true; string16 accelerator; - if (bubble_type == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION) { + if (bubble_type == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION || + bubble_type == FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) { accelerator = browser_fullscreen_exit_accelerator_; } else if (bubble_type == FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION) { accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY); |