Minor refactor of ExclusiveAccessView (fullscreen info bubble).

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 95 matching lines @@
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::LinkListener
   void LinkClicked(views::Link* source, int event_flags) override;
 
   void UpdateContent(const GURL& url, ExclusiveAccessBubbleType bubble_type);
 
  private:
   ExclusiveAccessBubbleViews* bubble_;
 
-  // Clickable hint text for exiting fullscreen mode.
+  // Clickable hint text for exiting fullscreen mode. (Non-simplified mode
+  // only.)
   views::Link* link_;
-  // Instruction for exiting mouse lock.
-  views::Label* mouse_lock_exit_instruction_;
-  // Informational label: 'www.foo.com has gone fullscreen'.
+  // Informational label: 'www.foo.com has gone fullscreen'. (Non-simplified
+  // mode only.)
   views::Label* message_label_;
+  // Clickable buttons to exit fullscreen. (Non-simplified mode only.)
   ButtonView* button_view_;
+  // Instruction for exiting fullscreen / mouse lock. Only present if there is
+  // no link or button (always present in simplified mode).
+  views::Label* exit_instruction_;
   const base::string16 browser_fullscreen_exit_accelerator_;
 
   DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessView);
 };
 
 ExclusiveAccessBubbleViews::ExclusiveAccessView::ExclusiveAccessView(
     ExclusiveAccessBubbleViews* bubble,
     const base::string16& accelerator,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
     : bubble_(bubble),
       link_(nullptr),
-      mouse_lock_exit_instruction_(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;
@@ skipping 17 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::FontList& medium_font_list =
       rb.GetFontList(ui::ResourceBundle::MediumFont);
 
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
     message_label_ = new views::Label(base::string16(), medium_font_list);
     message_label_->SetEnabledColor(foreground_color);
     message_label_->SetBackgroundColor(background_color);
   }
 
-  mouse_lock_exit_instruction_ =
+  exit_instruction_ =
       new views::Label(bubble_->GetInstructionText(), medium_font_list);
-  mouse_lock_exit_instruction_->set_collapse_when_hidden(true);
+  exit_instruction_->set_collapse_when_hidden(true);
 
-  mouse_lock_exit_instruction_->SetEnabledColor(foreground_color);
-  mouse_lock_exit_instruction_->SetBackgroundColor(background_color);
+  exit_instruction_->SetEnabledColor(foreground_color);
+  exit_instruction_->SetBackgroundColor(background_color);
 
   link_ = new views::Link();
   link_->set_collapse_when_hidden(true);
   link_->SetFocusable(false);
 #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(medium_font_list);
@@ skipping 19 matching lines @@
                      views::GridLayout::USE_PREF, 0, 0);
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                      views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
     DCHECK(message_label_);
     layout->AddView(message_label_);
   }
   layout->AddView(button_view_);
-  layout->AddView(mouse_lock_exit_instruction_);
+  layout->AddView(exit_instruction_);
   layout->AddView(link_);
 
   gfx::Insets padding(kPaddingPx, kPaddingPx, kPaddingPx, kPaddingPx);
   padding += GetInsets();
   layout->SetInsets(padding);
   SetLayoutManager(layout);
 
   UpdateContent(url, bubble_type);
 }
 
@@ skipping 20 matching lines @@
     ExclusiveAccessBubbleType bubble_type) {
   DCHECK_NE(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE, bubble_type);
 
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
     DCHECK(message_label_);
     message_label_->SetText(bubble_->GetCurrentMessageText());
   }
 
   if (exclusive_access_bubble::ShowButtonsForType(bubble_type)) {
     link_->SetVisible(false);
-    mouse_lock_exit_instruction_->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;
@@ skipping 10 matching lines @@
     }
 #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));
     }
 #endif
     link_->SetVisible(link_visible);
-    mouse_lock_exit_instruction_->SetVisible(!link_visible);
+    exit_instruction_->SetVisible(!link_visible);
     button_view_->SetVisible(false);
   }
 }
 
 // ExclusiveAccessBubbleViews --------------------------------------------------
 
 ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews(
     ExclusiveAccessBubbleViewsContext* context,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
@@ skipping 268 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   UpdateForImmersiveState();
 }
 
 void ExclusiveAccessBubbleViews::OnWidgetVisibilityChanged(
     views::Widget* widget,
     bool visible) {
   UpdateMouseWatcher();
 }