chrome/browser/ui/views/exclusive_access_bubble_views.cc - Issue 903683005: Always prompt for permission on fullscreen and mouse lock on file:// URLs

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/exclusive_access_bubble_views.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: style fixes and remove unused includes 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/exclusive_access/mouse_lock_controller.cc ('k') | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | chrome/browser/ui/website_settings/permission_menu_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 902bdc2f55390f5e57b08486aac51f5ce219217d..88035ff64469a4a79e55e2cfec363e74c8c4764f 100644

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

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

@@ -166,7 +166,6 @@ ExclusiveAccessBubbleViews::ExclusiveAccessView::ExclusiveAccessView(

mouse_lock_exit_instruction_->SetBackgroundColor(background()->get_color());

button_view_ = new ButtonView(this, kPaddingPx);

- button_view_->accept_button()->SetText(bubble->GetAllowButtonText());

views::GridLayout* layout = new views::GridLayout(this);

views::ColumnSet* columns = layout->AddColumnSet(0);

@@ -224,6 +223,9 @@ void ExclusiveAccessBubbleViews::ExclusiveAccessView::UpdateContent(

button_view_->SetVisible(true);

button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText());

button_view_->deny_button()->SetMinSize(gfx::Size());

+ button_view_->accept_button()->SetText(

+ bubble_->GetCurrentAllowButtonText());

+ button_view_->accept_button()->SetMinSize(gfx::Size());

} else {

bool link_visible = true;

base::string16 accelerator;