Change exclusive access popup behaviour with simplified-fullscreen-ui.

chrome/browser/ui/views/exclusive_access_bubble_views.cc

 // 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.
 
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 248 matching lines @@
     ExclusiveAccessBubbleViewsContext* context,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
     : ExclusiveAccessBubble(context->GetExclusiveAccessManager(),
                             url,
                             bubble_type),
       bubble_view_context_(context),
       popup_(nullptr),
       animation_(new gfx::SlideAnimation(this)),
       animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) {
-  animation_->Reset(1);
+  // With the simplified fullscreen UI flag, initially hide the bubble;
+  // otherwise, initially show it.
+  double initial_value =
+      ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ? 0 : 1;
+  animation_->Reset(initial_value);
 
   // Create the contents view.
   ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);
   bool got_accelerator =
       bubble_view_context_->GetBubbleAssociatedWidget()->GetAccelerator(
           IDC_FULLSCREEN, &accelerator);
   DCHECK(got_accelerator);
   view_ = new ExclusiveAccessView(this, accelerator.GetShortcutText(), url,
                                   bubble_type_);
 
@@ skipping 10 matching lines @@
   popup_->Init(params);
   popup_->SetContentsView(view_);
   gfx::Size size = GetPopupRect(true).size();
   popup_->SetBounds(GetPopupRect(false));
   // We set layout manager to nullptr to prevent the widget from sizing its
   // contents to the same size as itself. This prevents the widget contents from
   // shrinking while we animate the height of the popup to give the impression
   // that it is sliding off the top of the screen.
   popup_->GetRootView()->SetLayoutManager(nullptr);
   view_->SetBounds(0, 0, size.width(), size.height());
-  popup_->ShowInactive();  // This does not activate the popup.
+  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
+    popup_->ShowInactive();  // This does not activate the popup.
 
   popup_->AddObserver(this);
 
   registrar_.Add(this, chrome::NOTIFICATION_FULLSCREEN_CHANGED,
                  content::Source<FullscreenController>(
                      bubble_view_context_->GetExclusiveAccessManager()
                          ->fullscreen_controller()));
 
   UpdateForImmersiveState();
 }
@@ skipping 207 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   UpdateForImmersiveState();
 }
 
 void ExclusiveAccessBubbleViews::OnWidgetVisibilityChanged(
     views::Widget* widget,
     bool visible) {
   UpdateMouseWatcher();
 }