Made fullscreen bubble text non-transparent.

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 26 matching lines @@
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 // ExclusiveAccessView ---------------------------------------------------------
 
 namespace {
 
 // Space between the site info label and the buttons / link.
 const int kMiddlePaddingPx = 30;
 
-// Gets the opacity of the bubble when not animating.
-int GetMaximumOpacity() {
-  return ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ? 180 : 255;
-}
+// Opacity of the background (out of 255). Only used with
+// IsSimplifiedFullscreenUIEnabled.
+const unsigned char kBackgroundOpacity = 180;
 
 class ButtonView : public views::View {
  public:
   ButtonView(views::ButtonListener* listener, int between_button_spacing);
   ~ButtonView() override;
 
   // Returns an empty size when the view is not visible.
   gfx::Size GetPreferredSize() const override;
 
   views::LabelButton* accept_button() const { return accept_button_; }
@@ skipping 77 matching lines @@
       button_view_(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_SHADOW;
+    shadow_type = views::BubbleBorder::NO_ASSETS;
 
   ui::NativeTheme* theme = ui::NativeTheme::instance();
   SkColor background_color =
       ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()
-          ? SK_ColorBLACK
+          ? SkColorSetA(SK_ColorBLACK, kBackgroundOpacity)
           : theme->GetSystemColor(ui::NativeTheme::kColorId_BubbleBackground);
   SkColor foreground_color =
       ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()
           ? SK_ColorWHITE
           : theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
 
   scoped_ptr<views::BubbleBorder> bubble_border(new views::BubbleBorder(
       views::BubbleBorder::NONE, shadow_type, background_color));
   set_background(new views::BubbleBackground(bubble_border.get()));
   SetBorder(bubble_border.Pass());
@@ skipping 170 matching lines @@
   params.parent =
       bubble_view_context_->GetBubbleAssociatedWidget()->GetNativeView();
   // The simplified UI just shows a notice; clicks should go through to the
   // underlying window.
   params.accept_events =
       !ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled();
   popup_->Init(params);
   popup_->SetContentsView(view_);
   gfx::Size size = GetPopupRect(true).size();
   popup_->SetBounds(GetPopupRect(false));
-  popup_->SetOpacity(GetMaximumOpacity());
   // 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());
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
     popup_->ShowInactive();  // This does not activate the popup.
 
   popup_->AddObserver(this);
@@ skipping 83 matching lines @@
     // switching the animated attribute midway through the animation looks
     // weird.
     animation_->End();
 
     animated_attribute_ = expected_animated_attribute;
 
     // We may have finished hiding |popup_|. However, the bounds animation
     // assumes |popup_| has the opacity when it is fully shown and the opacity
     // animation assumes |popup_| has the bounds when |popup_| is fully shown.
     if (animated_attribute_ == ANIMATED_ATTRIBUTE_BOUNDS)
-      popup_->SetOpacity(GetMaximumOpacity());
+      popup_->SetOpacity(255);
     else
       UpdateBounds();
   }
 
   UpdateMouseWatcher();
 }
 
 void ExclusiveAccessBubbleViews::UpdateBounds() {
   gfx::Rect popup_rect(GetPopupRect(false));
   if (!popup_rect.IsEmpty()) {
     popup_->SetBounds(popup_rect);
     view_->SetY(popup_rect.height() - view_->height());
   }
 }
 
 views::View* ExclusiveAccessBubbleViews::GetBrowserRootView() const {
   return bubble_view_context_->GetBubbleAssociatedWidget()->GetRootView();
 }
 
 void ExclusiveAccessBubbleViews::AnimationProgressed(
     const gfx::Animation* animation) {
   if (animated_attribute_ == ANIMATED_ATTRIBUTE_OPACITY) {
-    int opacity = animation_->CurrentValueBetween(0, GetMaximumOpacity());
+    int opacity = animation_->CurrentValueBetween(0, 255);
     if (opacity == 0) {
       popup_->Hide();
     } else {
       popup_->Show();
       popup_->SetOpacity(opacity);
     }
   } else {
     if (GetPopupRect(false).IsEmpty()) {
       popup_->Hide();
     } else {
@@ skipping 91 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   UpdateForImmersiveState();
 }
 
 void ExclusiveAccessBubbleViews::OnWidgetVisibilityChanged(
     views::Widget* widget,
     bool visible) {
   UpdateMouseWatcher();
 }