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

Side by Side Diff: chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

Issue 903683005: Always prompt for permission on fullscreen and mouse lock on file:// URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak unit test Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h" 5 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 base::string16 ExclusiveAccessBubble::GetCurrentMessageText() const { 131 base::string16 ExclusiveAccessBubble::GetCurrentMessageText() const {
132 return exclusive_access_bubble::GetLabelTextForType( 132 return exclusive_access_bubble::GetLabelTextForType(
133 bubble_type_, url_, 133 bubble_type_, url_,
134 extensions::ExtensionRegistry::Get(browser_->profile())); 134 extensions::ExtensionRegistry::Get(browser_->profile()));
135 } 135 }
136 136
137 base::string16 ExclusiveAccessBubble::GetCurrentDenyButtonText() const { 137 base::string16 ExclusiveAccessBubble::GetCurrentDenyButtonText() const {
138 return exclusive_access_bubble::GetDenyButtonTextForType(bubble_type_); 138 return exclusive_access_bubble::GetDenyButtonTextForType(bubble_type_);
139 } 139 }
140 140
141 base::string16 ExclusiveAccessBubble::GetAllowButtonText() const { 141 base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {
142 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW); 142 return exclusive_access_bubble::GetAllowButtonTextForType(bubble_type_, url_);
143 } 143 }
144 144
145 base::string16 ExclusiveAccessBubble::GetInstructionText() const { 145 base::string16 ExclusiveAccessBubble::GetInstructionText() const {
146 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, 146 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
147 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); 147 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
148 } 148 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698