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

Unified Diff: chrome/browser/ui/views/exclusive_access_bubble_views.cc

Issue 1254543002: Change exclusive access popup behaviour with simplified-fullscreen-ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@exclusiveaccess-remove-confirmation
Patch Set: Minor. Created 5 years, 4 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/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 466355d0ae325ae475b08fd75437040a6794b350..b5230caea20ba17f56fafb173b9cb29daa1e9771 100644
--- a/chrome/browser/ui/views/exclusive_access_bubble_views.cc
+++ b/chrome/browser/ui/views/exclusive_access_bubble_views.cc
@@ -266,7 +266,9 @@ ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews(
popup_(nullptr),
animation_(new gfx::SlideAnimation(this)),
animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) {
- animation_->Reset(1);
+ double initial_value =
msw 2015/08/04 18:23:57 nit: maybe add a comment here
Matt Giuca 2015/08/05 03:27:20 Done.
+ ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ? 0 : 1;
+ animation_->Reset(initial_value);
// Create the contents view.
ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);
@@ -298,6 +300,8 @@ ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews(
popup_->GetRootView()->SetLayoutManager(nullptr);
view_->SetBounds(0, 0, size.width(), size.height());
popup_->ShowInactive(); // This does not activate the popup.
+ if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
+ popup_->Hide(); // Keep hidden by default.
msw 2015/08/04 18:23:57 nit: can you just avoid the ShowInactive instead o
Matt Giuca 2015/08/05 03:27:20 Done.
popup_->AddObserver(this);

Powered by Google App Engine
This is Rietveld 408576698