Fullscreen / mouselock bubble: Use new theming even when flag disabled.

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 <utility>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 32 matching lines @@
 // ExclusiveAccessView ---------------------------------------------------------
 
 namespace {
 
 // Space between the site info label and the buttons / link.
 const int kMiddlePaddingPx = 30;
 
 const int kOuterPaddingHorizPx = 40;
 const int kOuterPaddingVertPx = 8;
 
-// Partially-transparent background color. Only used with
-// IsSimplifiedFullscreenUIEnabled.
+// Partially-transparent background color.
 const SkColor kBackgroundColor = SkColorSetARGB(0xcc, 0x28, 0x2c, 0x32);
 
 class ButtonView : public views::View {
  public:
   ButtonView(views::ButtonListener* listener, int between_button_spacing);
   ~ButtonView() override;
 
   views::LabelButton* accept_button() const { return accept_button_; }
   views::LabelButton* deny_button() const { return deny_button_; }
 
@@ skipping 159 matching lines @@
     ExclusiveAccessBubbleViews* bubble,
     const base::string16& accelerator,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
     : bubble_(bubble),
       link_(nullptr),
       message_label_(nullptr),
       button_view_(nullptr),
       exit_instruction_(nullptr),
       browser_fullscreen_exit_accelerator_(accelerator) {
-  views::BubbleBorder::Shadow shadow_type = views::BubbleBorder::BIG_SHADOW;
-#if defined(OS_LINUX)
-  // Use a smaller shadow on Linux (including ChromeOS) as the shadow assets can
-  // overlap each other in a fullscreen notification bubble.
-  // See http://crbug.com/462983.
-  shadow_type = views::BubbleBorder::SMALL_SHADOW;
-#endif
-  if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
-    shadow_type = views::BubbleBorder::NO_ASSETS;
-
-  // TODO(estade): don't use this static instance. See http://crbug.com/558162
-  ui::NativeTheme* theme = ui::NativeTheme::GetInstanceForWeb();
-  SkColor background_color =
-      ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()
-          ? kBackgroundColor
-          : theme->GetSystemColor(ui::NativeTheme::kColorId_BubbleBackground);
-  SkColor foreground_color =
-      ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()
-          ? SK_ColorWHITE
-          : theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
+  const SkColor kForegroundColor = SK_ColorWHITE;
 
   std::unique_ptr<views::BubbleBorder> bubble_border(new views::BubbleBorder(
-      views::BubbleBorder::NONE, shadow_type, background_color));
+      views::BubbleBorder::NONE, views::BubbleBorder::NO_ASSETS,
+      kBackgroundColor));
   set_background(new views::BubbleBackground(bubble_border.get()));
   SetBorder(std::move(bubble_border));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::FontList& font_list =
       rb.GetFontList(ui::ResourceBundle::MediumFont);
 
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
     message_label_ = new views::Label(base::string16(), font_list);
-    message_label_->SetEnabledColor(foreground_color);
-    message_label_->SetBackgroundColor(background_color);
+    message_label_->SetEnabledColor(kForegroundColor);
+    message_label_->SetBackgroundColor(kBackgroundColor);
   }
 
   exit_instruction_ = new InstructionView(base::string16(), font_list,
-                                          foreground_color, background_color);
+                                          kForegroundColor, kBackgroundColor);
 
   link_ = new views::Link();
   link_->SetFocusBehavior(FocusBehavior::NEVER);
 #if defined(OS_CHROMEOS)
   // On CrOS, the link text doesn't change, since it doesn't show the shortcut.
   link_->SetText(l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE));
 #endif
   link_->set_listener(this);
   link_->SetFontList(font_list);
-  link_->SetPressedColor(foreground_color);
-  link_->SetEnabledColor(foreground_color);
-  link_->SetBackgroundColor(background_color);
+  link_->SetPressedColor(kForegroundColor);
+  link_->SetEnabledColor(kForegroundColor);
+  link_->SetBackgroundColor(kBackgroundColor);
   link_->SetVisible(false);
 
   button_view_ = new ButtonView(this, kPaddingPx);
 
   int outer_padding_horiz = kOuterPaddingHorizPx;
   int outer_padding_vert = kOuterPaddingVertPx;
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
     DCHECK(message_label_);
     AddChildView(message_label_);
-
-    outer_padding_horiz = kPaddingPx;
-    outer_padding_vert = kPaddingPx;
   }
   AddChildView(button_view_);
   AddChildView(exit_instruction_);
   AddChildView(link_);
 
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, outer_padding_horiz,
                            outer_padding_vert, kMiddlePaddingPx);
   SetLayoutManager(layout);
 
@@ skipping 16 matching lines @@
     views::Link* link,
     int event_flags) {
   bubble_->ExitExclusiveAccess();
 }
 
 void ExclusiveAccessBubbleViews::ExclusiveAccessView::UpdateContent(
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type) {
   DCHECK_NE(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE, bubble_type);
 
-  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
-    DCHECK(message_label_);
-    message_label_->SetText(bubble_->GetCurrentMessageText());
+  bool link_visible =
+      !ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled();
+  base::string16 accelerator;
+  if (bubble_type ==
+          EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION ||
+      bubble_type ==
+          EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) {
+    accelerator = browser_fullscreen_exit_accelerator_;

[msw, 2016/05/13 17:08:11]

nit: init |accelerator| to this value, to simplify the conditional block.

[Matt Giuca, 2016/05/16 04:59:45]

I'm not sure how that simplifies things (it just reduces one line of code). It
means accelerator gets assigned to potentially the wrong value, then gets
corrected. And it means unnecessarily copying the string even if it's not used.
Doesn't seem good to me.

+  } else {
+    accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY);
+    if (bubble_type !=
+        EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION) {
+      link_visible = false;
+    }
   }
-
-  if (exclusive_access_bubble::ShowButtonsForType(bubble_type)) {
-    link_->SetVisible(false);
-    exit_instruction_->SetVisible(false);
-    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 =
-        !ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled();
-    base::string16 accelerator;
-    if (bubble_type ==
-            EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION ||
-        bubble_type ==
-            EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) {
-      accelerator = browser_fullscreen_exit_accelerator_;
-    } else {
-      accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY);
-      if (bubble_type !=
-          EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION) {
-        link_visible = false;
-      }
-    }
 #if !defined(OS_CHROMEOS)
-    if (link_visible) {
-      link_->SetText(l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE) +
-                     base::UTF8ToUTF16(" ") +
-                     l10n_util::GetStringFUTF16(
-                         IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR, accelerator));
-    }
+  if (link_visible) {
+    link_->SetText(l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE) +
+                   base::UTF8ToUTF16(" ") +
+                   l10n_util::GetStringFUTF16(
+                       IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR, accelerator));
+  }
 #endif
-    link_->SetVisible(link_visible);
-    exit_instruction_->SetText(bubble_->GetInstructionText(accelerator));
-    exit_instruction_->SetVisible(!link_visible);
-    button_view_->SetVisible(false);
-  }
+  link_->SetVisible(link_visible);
+  exit_instruction_->SetText(bubble_->GetInstructionText(accelerator));
+  exit_instruction_->SetVisible(!link_visible);
+  button_view_->SetVisible(false);

[msw, 2016/05/13 17:08:11]

nit: add a TODO to remove |button_view_| (and includes, etc.)?

[Matt Giuca, 2016/05/16 04:59:45]

Done.

 }
 
 // ExclusiveAccessBubbleViews --------------------------------------------------
 
 ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews(
     ExclusiveAccessBubbleViewsContext* context,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
     : ExclusiveAccessBubble(context->GetExclusiveAccessManager(),
                             url,
@@ skipping 98 matching lines @@
   if (popup_->IsVisible())
     UpdateBounds();
 }
 
 views::View* ExclusiveAccessBubbleViews::GetView() {
   return view_;
 }
 
 ExclusiveAccessBubbleViews::AnimatedAttribute
 ExclusiveAccessBubbleViews::ExpectedAnimationAttribute() {
-  return ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ||
-                 bubble_view_context_->IsImmersiveModeEnabled()
-             ? ANIMATED_ATTRIBUTE_OPACITY
-             : ANIMATED_ATTRIBUTE_BOUNDS;
+  // TODO(mgiuca): Delete this function.
+  return ANIMATED_ATTRIBUTE_OPACITY;
 }
 
 void ExclusiveAccessBubbleViews::UpdateMouseWatcher() {
   bool should_watch_mouse = false;
   if (popup_->IsVisible())
     should_watch_mouse =
         !exclusive_access_bubble::ShowButtonsForType(bubble_type_);
   else
     should_watch_mouse = CanMouseTriggerSlideIn();
 
@@ skipping 79 matching lines @@
     // - Querying the top container height may return the height before entering
     //   fullscreen because layout is disabled while entering fullscreen.
     // A visual glitch due to the delayed layout is avoided in immersive
     // fullscreen because entering fullscreen starts with the top container
     // revealed. When revealed, the top container has the same height as before
     // entering fullscreen.
     top_container_bottom =
         bubble_view_context_->GetTopContainerBoundsInScreen().bottom();
   }
   // |desired_top| is the top of the bubble area including the shadow.
-  int popup_top = ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()
-                      ? kSimplifiedPopupTopPx
-                      : kPopupTopPx;
+  int popup_top = kSimplifiedPopupTopPx;

[msw, 2016/05/13 17:08:11]

nit: inline below.

[Matt Giuca, 2016/05/16 04:59:45]

Done.

   int desired_top = popup_top - view_->border()->GetInsets().top();
   int y = top_container_bottom + desired_top;
 
   if (!ignore_animation_state &&
       animated_attribute_ == ANIMATED_ATTRIBUTE_BOUNDS) {
     int total_height = size.height() + desired_top;
     int popup_bottom = animation_->CurrentValueBetween(total_height, 0);
     int y_offset = std::min(popup_bottom, desired_top);
     size.set_height(size.height() - popup_bottom + y_offset);
     y -= y_offset;
@@ skipping 37 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   UpdateForImmersiveState();
 }
 
 void ExclusiveAccessBubbleViews::OnWidgetVisibilityChanged(
     views::Widget* widget,
     bool visible) {
   UpdateMouseWatcher();
 }