| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" | 5 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" | 11 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 13 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 13 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 14 #include "chrome/browser/ui/views/frame/top_container_view.h" | 14 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 15 #include "chrome/grit/generated_resources.h" | 15 #include "chrome/grit/generated_resources.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 28 #include "ui/views/layout/box_layout.h" | 28 #include "ui/views/layout/box_layout.h" |
| 29 #include "ui/views/layout/grid_layout.h" | 29 #include "ui/views/layout/grid_layout.h" |
| 30 #include "ui/views/view.h" | 30 #include "ui/views/view.h" |
| 31 #include "ui/views/widget/widget.h" | 31 #include "ui/views/widget/widget.h" |
| 32 #include "url/gurl.h" | 32 #include "url/gurl.h" |
| 33 | 33 |
| 34 #if defined(OS_WIN) | 34 #if defined(OS_WIN) |
| 35 #include "ui/base/l10n/l10n_util_win.h" | 35 #include "ui/base/l10n/l10n_util_win.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 // FullscreenExitView ---------------------------------------------------------- | 38 // ExclusiveAccessView --------------------------------------------------------- |
| 39 | 39 |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 // Space between the site info label and the buttons / link. | 42 // Space between the site info label and the buttons / link. |
| 43 const int kMiddlePaddingPx = 30; | 43 const int kMiddlePaddingPx = 30; |
| 44 | 44 |
| 45 class ButtonView : public views::View { | 45 class ButtonView : public views::View { |
| 46 public: | 46 public: |
| 47 ButtonView(views::ButtonListener* listener, int between_button_spacing); | 47 ButtonView(views::ButtonListener* listener, int between_button_spacing); |
| 48 ~ButtonView() override; | 48 ~ButtonView() override; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 80 |
| 81 ButtonView::~ButtonView() { | 81 ButtonView::~ButtonView() { |
| 82 } | 82 } |
| 83 | 83 |
| 84 gfx::Size ButtonView::GetPreferredSize() const { | 84 gfx::Size ButtonView::GetPreferredSize() const { |
| 85 return visible() ? views::View::GetPreferredSize() : gfx::Size(); | 85 return visible() ? views::View::GetPreferredSize() : gfx::Size(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace | 88 } // namespace |
| 89 | 89 |
| 90 class FullscreenExitBubbleViews::FullscreenExitView | 90 class ExclusiveAccessBubbleViews::ExclusiveAccessView |
| 91 : public views::View, | 91 : public views::View, |
| 92 public views::ButtonListener, | 92 public views::ButtonListener, |
| 93 public views::LinkListener { | 93 public views::LinkListener { |
| 94 public: | 94 public: |
| 95 FullscreenExitView(FullscreenExitBubbleViews* bubble, | 95 ExclusiveAccessView(ExclusiveAccessBubbleViews* bubble, |
| 96 const base::string16& accelerator, | 96 const base::string16& accelerator, |
| 97 const GURL& url, | 97 const GURL& url, |
| 98 FullscreenExitBubbleType bubble_type); | 98 ExclusiveAccessBubbleType bubble_type); |
| 99 ~FullscreenExitView() override; | 99 ~ExclusiveAccessView() override; |
| 100 | 100 |
| 101 // views::ButtonListener | 101 // views::ButtonListener |
| 102 void ButtonPressed(views::Button* sender, const ui::Event& event) override; | 102 void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
| 103 | 103 |
| 104 // views::LinkListener | 104 // views::LinkListener |
| 105 void LinkClicked(views::Link* source, int event_flags) override; | 105 void LinkClicked(views::Link* source, int event_flags) override; |
| 106 | 106 |
| 107 void UpdateContent(const GURL& url, FullscreenExitBubbleType bubble_type); | 107 void UpdateContent(const GURL& url, ExclusiveAccessBubbleType bubble_type); |
| 108 | 108 |
| 109 private: | 109 private: |
| 110 FullscreenExitBubbleViews* bubble_; | 110 ExclusiveAccessBubbleViews* bubble_; |
| 111 | 111 |
| 112 // Clickable hint text for exiting fullscreen mode. | 112 // Clickable hint text for exiting fullscreen mode. |
| 113 views::Link* link_; | 113 views::Link* link_; |
| 114 // Instruction for exiting mouse lock. | 114 // Instruction for exiting mouse lock. |
| 115 views::Label* mouse_lock_exit_instruction_; | 115 views::Label* mouse_lock_exit_instruction_; |
| 116 // Informational label: 'www.foo.com has gone fullscreen'. | 116 // Informational label: 'www.foo.com has gone fullscreen'. |
| 117 views::Label* message_label_; | 117 views::Label* message_label_; |
| 118 ButtonView* button_view_; | 118 ButtonView* button_view_; |
| 119 const base::string16 browser_fullscreen_exit_accelerator_; | 119 const base::string16 browser_fullscreen_exit_accelerator_; |
| 120 | 120 |
| 121 DISALLOW_COPY_AND_ASSIGN(FullscreenExitView); | 121 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessView); |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView( | 124 ExclusiveAccessBubbleViews::ExclusiveAccessView::ExclusiveAccessView( |
| 125 FullscreenExitBubbleViews* bubble, | 125 ExclusiveAccessBubbleViews* bubble, |
| 126 const base::string16& accelerator, | 126 const base::string16& accelerator, |
| 127 const GURL& url, | 127 const GURL& url, |
| 128 FullscreenExitBubbleType bubble_type) | 128 ExclusiveAccessBubbleType bubble_type) |
| 129 : bubble_(bubble), | 129 : bubble_(bubble), |
| 130 link_(NULL), | 130 link_(NULL), |
| 131 mouse_lock_exit_instruction_(NULL), | 131 mouse_lock_exit_instruction_(NULL), |
| 132 message_label_(NULL), | 132 message_label_(NULL), |
| 133 button_view_(NULL), | 133 button_view_(NULL), |
| 134 browser_fullscreen_exit_accelerator_(accelerator) { | 134 browser_fullscreen_exit_accelerator_(accelerator) { |
| 135 scoped_ptr<views::BubbleBorder> bubble_border( | 135 scoped_ptr<views::BubbleBorder> bubble_border( |
| 136 new views::BubbleBorder(views::BubbleBorder::NONE, | 136 new views::BubbleBorder(views::BubbleBorder::NONE, |
| 137 views::BubbleBorder::BIG_SHADOW, | 137 views::BubbleBorder::BIG_SHADOW, |
| 138 SK_ColorWHITE)); | 138 SK_ColorWHITE)); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 layout->AddView(link_); | 188 layout->AddView(link_); |
| 189 | 189 |
| 190 gfx::Insets padding(kPaddingPx, kPaddingPx, kPaddingPx, kPaddingPx); | 190 gfx::Insets padding(kPaddingPx, kPaddingPx, kPaddingPx, kPaddingPx); |
| 191 padding += GetInsets(); | 191 padding += GetInsets(); |
| 192 layout->SetInsets(padding); | 192 layout->SetInsets(padding); |
| 193 SetLayoutManager(layout); | 193 SetLayoutManager(layout); |
| 194 | 194 |
| 195 UpdateContent(url, bubble_type); | 195 UpdateContent(url, bubble_type); |
| 196 } | 196 } |
| 197 | 197 |
| 198 FullscreenExitBubbleViews::FullscreenExitView::~FullscreenExitView() { | 198 ExclusiveAccessBubbleViews::ExclusiveAccessView::~ExclusiveAccessView() { |
| 199 } | 199 } |
| 200 | 200 |
| 201 void FullscreenExitBubbleViews::FullscreenExitView::ButtonPressed( | 201 void ExclusiveAccessBubbleViews::ExclusiveAccessView::ButtonPressed( |
| 202 views::Button* sender, | 202 views::Button* sender, |
| 203 const ui::Event& event) { | 203 const ui::Event& event) { |
| 204 if (sender == button_view_->accept_button()) | 204 if (sender == button_view_->accept_button()) |
| 205 bubble_->Accept(); | 205 bubble_->Accept(); |
| 206 else | 206 else |
| 207 bubble_->Cancel(); | 207 bubble_->Cancel(); |
| 208 } | 208 } |
| 209 | 209 |
| 210 void FullscreenExitBubbleViews::FullscreenExitView::LinkClicked( | 210 void ExclusiveAccessBubbleViews::ExclusiveAccessView::LinkClicked( |
| 211 views::Link* link, | 211 views::Link* link, |
| 212 int event_flags) { | 212 int event_flags) { |
| 213 bubble_->ToggleFullscreen(); | 213 bubble_->ToggleFullscreen(); |
| 214 } | 214 } |
| 215 | 215 |
| 216 void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent( | 216 void ExclusiveAccessBubbleViews::ExclusiveAccessView::UpdateContent( |
| 217 const GURL& url, | 217 const GURL& url, |
| 218 FullscreenExitBubbleType bubble_type) { | 218 ExclusiveAccessBubbleType bubble_type) { |
| 219 DCHECK_NE(FEB_TYPE_NONE, bubble_type); | 219 DCHECK_NE(EAB_TYPE_NONE, bubble_type); |
| 220 | 220 |
| 221 message_label_->SetText(bubble_->GetCurrentMessageText()); | 221 message_label_->SetText(bubble_->GetCurrentMessageText()); |
| 222 if (fullscreen_bubble::ShowButtonsForType(bubble_type)) { | 222 if (exclusive_access_bubble::ShowButtonsForType(bubble_type)) { |
| 223 link_->SetVisible(false); | 223 link_->SetVisible(false); |
| 224 mouse_lock_exit_instruction_->SetVisible(false); | 224 mouse_lock_exit_instruction_->SetVisible(false); |
| 225 button_view_->SetVisible(true); | 225 button_view_->SetVisible(true); |
| 226 button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText()); | 226 button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText()); |
| 227 button_view_->deny_button()->SetMinSize(gfx::Size()); | 227 button_view_->deny_button()->SetMinSize(gfx::Size()); |
| 228 } else { | 228 } else { |
| 229 bool link_visible = true; | 229 bool link_visible = true; |
| 230 base::string16 accelerator; | 230 base::string16 accelerator; |
| 231 if (bubble_type == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION || | 231 if (bubble_type == EAB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION || |
| 232 bubble_type == FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) { | 232 bubble_type == EAB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) { |
| 233 accelerator = browser_fullscreen_exit_accelerator_; | 233 accelerator = browser_fullscreen_exit_accelerator_; |
| 234 } else if (bubble_type == FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION) { | 234 } else if (bubble_type == EAB_TYPE_FULLSCREEN_EXIT_INSTRUCTION) { |
| 235 accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY); | 235 accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY); |
| 236 } else { | 236 } else { |
| 237 link_visible = false; | 237 link_visible = false; |
| 238 } | 238 } |
| 239 #if !defined(OS_CHROMEOS) | 239 #if !defined(OS_CHROMEOS) |
| 240 if (link_visible) { | 240 if (link_visible) { |
| 241 link_->SetText( | 241 link_->SetText( |
| 242 l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE) + | 242 l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE) + |
| 243 base::UTF8ToUTF16(" ") + | 243 base::UTF8ToUTF16(" ") + |
| 244 l10n_util::GetStringFUTF16(IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR, | 244 l10n_util::GetStringFUTF16(IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR, |
| 245 accelerator)); | 245 accelerator)); |
| 246 } | 246 } |
| 247 #endif | 247 #endif |
| 248 link_->SetVisible(link_visible); | 248 link_->SetVisible(link_visible); |
| 249 mouse_lock_exit_instruction_->SetVisible(!link_visible); | 249 mouse_lock_exit_instruction_->SetVisible(!link_visible); |
| 250 button_view_->SetVisible(false); | 250 button_view_->SetVisible(false); |
| 251 } | 251 } |
| 252 } | 252 } |
| 253 | 253 |
| 254 | 254 |
| 255 // FullscreenExitBubbleViews --------------------------------------------------- | 255 // ExclusiveAccessBubbleViews -------------------------------------------------- |
| 256 | 256 |
| 257 FullscreenExitBubbleViews::FullscreenExitBubbleViews( | 257 ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews( |
| 258 BrowserView* browser_view, | 258 BrowserView* browser_view, |
| 259 const GURL& url, | 259 const GURL& url, |
| 260 FullscreenExitBubbleType bubble_type) | 260 ExclusiveAccessBubbleType bubble_type) |
| 261 : FullscreenExitBubble(browser_view->browser(), url, bubble_type), | 261 : ExclusiveAccessBubble(browser_view->browser(), url, bubble_type), |
| 262 browser_view_(browser_view), | 262 browser_view_(browser_view), |
| 263 popup_(NULL), | 263 popup_(NULL), |
| 264 animation_(new gfx::SlideAnimation(this)), | 264 animation_(new gfx::SlideAnimation(this)), |
| 265 animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) { | 265 animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) { |
| 266 animation_->Reset(1); | 266 animation_->Reset(1); |
| 267 | 267 |
| 268 // Create the contents view. | 268 // Create the contents view. |
| 269 ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE); | 269 ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE); |
| 270 bool got_accelerator = browser_view_->GetWidget()->GetAccelerator( | 270 bool got_accelerator = browser_view_->GetWidget()->GetAccelerator( |
| 271 IDC_FULLSCREEN, &accelerator); | 271 IDC_FULLSCREEN, &accelerator); |
| 272 DCHECK(got_accelerator); | 272 DCHECK(got_accelerator); |
| 273 view_ = new FullscreenExitView( | 273 view_ = new ExclusiveAccessView( |
| 274 this, accelerator.GetShortcutText(), url, bubble_type_); | 274 this, accelerator.GetShortcutText(), url, bubble_type_); |
| 275 | 275 |
| 276 // TODO(yzshen): Change to use the new views bubble, BubbleDelegateView. | 276 // TODO(yzshen): Change to use the new views bubble, BubbleDelegateView. |
| 277 // TODO(pkotwicz): When this becomes a views bubble, make sure that this | 277 // TODO(pkotwicz): When this becomes a views bubble, make sure that this |
| 278 // bubble is ignored by ImmersiveModeControllerAsh::BubbleManager. | 278 // bubble is ignored by ImmersiveModeControllerAsh::BubbleManager. |
| 279 // Initialize the popup. | 279 // Initialize the popup. |
| 280 popup_ = new views::Widget; | 280 popup_ = new views::Widget; |
| 281 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); | 281 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); |
| 282 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 282 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 283 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 283 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 298 | 298 |
| 299 registrar_.Add( | 299 registrar_.Add( |
| 300 this, | 300 this, |
| 301 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 301 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
| 302 content::Source<FullscreenController>( | 302 content::Source<FullscreenController>( |
| 303 browser_view_->browser()->fullscreen_controller())); | 303 browser_view_->browser()->fullscreen_controller())); |
| 304 | 304 |
| 305 UpdateForImmersiveState(); | 305 UpdateForImmersiveState(); |
| 306 } | 306 } |
| 307 | 307 |
| 308 FullscreenExitBubbleViews::~FullscreenExitBubbleViews() { | 308 ExclusiveAccessBubbleViews::~ExclusiveAccessBubbleViews() { |
| 309 popup_->RemoveObserver(this); | 309 popup_->RemoveObserver(this); |
| 310 | 310 |
| 311 // This is tricky. We may be in an ATL message handler stack, in which case | 311 // This is tricky. We may be in an ATL message handler stack, in which case |
| 312 // the popup cannot be deleted yet. We also can't set the popup's ownership | 312 // the popup cannot be deleted yet. We also can't set the popup's ownership |
| 313 // model to NATIVE_WIDGET_OWNS_WIDGET because if the user closed the last tab | 313 // model to NATIVE_WIDGET_OWNS_WIDGET because if the user closed the last tab |
| 314 // while in fullscreen mode, Windows has already destroyed the popup HWND by | 314 // while in fullscreen mode, Windows has already destroyed the popup HWND by |
| 315 // the time we get here, and thus either the popup will already have been | 315 // the time we get here, and thus either the popup will already have been |
| 316 // deleted (if we set this in our constructor) or the popup will never get | 316 // deleted (if we set this in our constructor) or the popup will never get |
| 317 // another OnFinalMessage() call (if not, as currently). So instead, we tell | 317 // another OnFinalMessage() call (if not, as currently). So instead, we tell |
| 318 // the popup to synchronously hide, and then asynchronously close and delete | 318 // the popup to synchronously hide, and then asynchronously close and delete |
| 319 // itself. | 319 // itself. |
| 320 popup_->Close(); | 320 popup_->Close(); |
| 321 base::MessageLoop::current()->DeleteSoon(FROM_HERE, popup_); | 321 base::MessageLoop::current()->DeleteSoon(FROM_HERE, popup_); |
| 322 } | 322 } |
| 323 | 323 |
| 324 void FullscreenExitBubbleViews::UpdateContent( | 324 void ExclusiveAccessBubbleViews::UpdateContent( |
| 325 const GURL& url, | 325 const GURL& url, |
| 326 FullscreenExitBubbleType bubble_type) { | 326 ExclusiveAccessBubbleType bubble_type) { |
| 327 DCHECK_NE(FEB_TYPE_NONE, bubble_type); | 327 DCHECK_NE(EAB_TYPE_NONE, bubble_type); |
| 328 if (bubble_type_ == bubble_type && url_ == url) | 328 if (bubble_type_ == bubble_type && url_ == url) |
| 329 return; | 329 return; |
| 330 | 330 |
| 331 url_ = url; | 331 url_ = url; |
| 332 bubble_type_ = bubble_type; | 332 bubble_type_ = bubble_type; |
| 333 view_->UpdateContent(url_, bubble_type_); | 333 view_->UpdateContent(url_, bubble_type_); |
| 334 | 334 |
| 335 gfx::Size size = GetPopupRect(true).size(); | 335 gfx::Size size = GetPopupRect(true).size(); |
| 336 view_->SetSize(size); | 336 view_->SetSize(size); |
| 337 popup_->SetBounds(GetPopupRect(false)); | 337 popup_->SetBounds(GetPopupRect(false)); |
| 338 Show(); | 338 Show(); |
| 339 | 339 |
| 340 // Stop watching the mouse even if UpdateMouseWatcher() will start watching | 340 // Stop watching the mouse even if UpdateMouseWatcher() will start watching |
| 341 // it again so that the popup with the new content is visible for at least | 341 // it again so that the popup with the new content is visible for at least |
| 342 // |kInitialDelayMs|. | 342 // |kInitialDelayMs|. |
| 343 StopWatchingMouse(); | 343 StopWatchingMouse(); |
| 344 | 344 |
| 345 UpdateMouseWatcher(); | 345 UpdateMouseWatcher(); |
| 346 } | 346 } |
| 347 | 347 |
| 348 void FullscreenExitBubbleViews::RepositionIfVisible() { | 348 void ExclusiveAccessBubbleViews::RepositionIfVisible() { |
| 349 if (popup_->IsVisible()) | 349 if (popup_->IsVisible()) |
| 350 UpdateBounds(); | 350 UpdateBounds(); |
| 351 } | 351 } |
| 352 | 352 |
| 353 void FullscreenExitBubbleViews::UpdateMouseWatcher() { | 353 void ExclusiveAccessBubbleViews::UpdateMouseWatcher() { |
| 354 bool should_watch_mouse = false; | 354 bool should_watch_mouse = false; |
| 355 if (popup_->IsVisible()) | 355 if (popup_->IsVisible()) |
| 356 should_watch_mouse = !fullscreen_bubble::ShowButtonsForType(bubble_type_); | 356 should_watch_mouse = !exclusive_access_bubble::ShowButtonsForType( |
| 357 bubble_type_); |
| 357 else | 358 else |
| 358 should_watch_mouse = CanMouseTriggerSlideIn(); | 359 should_watch_mouse = CanMouseTriggerSlideIn(); |
| 359 | 360 |
| 360 if (should_watch_mouse == IsWatchingMouse()) | 361 if (should_watch_mouse == IsWatchingMouse()) |
| 361 return; | 362 return; |
| 362 | 363 |
| 363 if (should_watch_mouse) | 364 if (should_watch_mouse) |
| 364 StartWatchingMouse(); | 365 StartWatchingMouse(); |
| 365 else | 366 else |
| 366 StopWatchingMouse(); | 367 StopWatchingMouse(); |
| 367 } | 368 } |
| 368 | 369 |
| 369 void FullscreenExitBubbleViews::UpdateForImmersiveState() { | 370 void ExclusiveAccessBubbleViews::UpdateForImmersiveState() { |
| 370 AnimatedAttribute expected_animated_attribute = | 371 AnimatedAttribute expected_animated_attribute = |
| 371 browser_view_->immersive_mode_controller()->IsEnabled() ? | 372 browser_view_->immersive_mode_controller()->IsEnabled() ? |
| 372 ANIMATED_ATTRIBUTE_OPACITY : ANIMATED_ATTRIBUTE_BOUNDS; | 373 ANIMATED_ATTRIBUTE_OPACITY : ANIMATED_ATTRIBUTE_BOUNDS; |
| 373 if (animated_attribute_ != expected_animated_attribute) { | 374 if (animated_attribute_ != expected_animated_attribute) { |
| 374 // If an animation is currently in progress, skip to the end because | 375 // If an animation is currently in progress, skip to the end because |
| 375 // switching the animated attribute midway through the animation looks | 376 // switching the animated attribute midway through the animation looks |
| 376 // weird. | 377 // weird. |
| 377 animation_->End(); | 378 animation_->End(); |
| 378 | 379 |
| 379 animated_attribute_ = expected_animated_attribute; | 380 animated_attribute_ = expected_animated_attribute; |
| 380 | 381 |
| 381 // We may have finished hiding |popup_|. However, the bounds animation | 382 // We may have finished hiding |popup_|. However, the bounds animation |
| 382 // assumes |popup_| has the opacity when it is fully shown and the opacity | 383 // assumes |popup_| has the opacity when it is fully shown and the opacity |
| 383 // animation assumes |popup_| has the bounds when |popup_| is fully shown. | 384 // animation assumes |popup_| has the bounds when |popup_| is fully shown. |
| 384 if (animated_attribute_ == ANIMATED_ATTRIBUTE_BOUNDS) | 385 if (animated_attribute_ == ANIMATED_ATTRIBUTE_BOUNDS) |
| 385 popup_->SetOpacity(255); | 386 popup_->SetOpacity(255); |
| 386 else | 387 else |
| 387 UpdateBounds(); | 388 UpdateBounds(); |
| 388 } | 389 } |
| 389 | 390 |
| 390 UpdateMouseWatcher(); | 391 UpdateMouseWatcher(); |
| 391 } | 392 } |
| 392 | 393 |
| 393 void FullscreenExitBubbleViews::UpdateBounds() { | 394 void ExclusiveAccessBubbleViews::UpdateBounds() { |
| 394 gfx::Rect popup_rect(GetPopupRect(false)); | 395 gfx::Rect popup_rect(GetPopupRect(false)); |
| 395 if (!popup_rect.IsEmpty()) { | 396 if (!popup_rect.IsEmpty()) { |
| 396 popup_->SetBounds(popup_rect); | 397 popup_->SetBounds(popup_rect); |
| 397 view_->SetY(popup_rect.height() - view_->height()); | 398 view_->SetY(popup_rect.height() - view_->height()); |
| 398 } | 399 } |
| 399 } | 400 } |
| 400 | 401 |
| 401 views::View* FullscreenExitBubbleViews::GetBrowserRootView() const { | 402 views::View* ExclusiveAccessBubbleViews::GetBrowserRootView() const { |
| 402 return browser_view_->GetWidget()->GetRootView(); | 403 return browser_view_->GetWidget()->GetRootView(); |
| 403 } | 404 } |
| 404 | 405 |
| 405 void FullscreenExitBubbleViews::AnimationProgressed( | 406 void ExclusiveAccessBubbleViews::AnimationProgressed( |
| 406 const gfx::Animation* animation) { | 407 const gfx::Animation* animation) { |
| 407 if (animated_attribute_ == ANIMATED_ATTRIBUTE_OPACITY) { | 408 if (animated_attribute_ == ANIMATED_ATTRIBUTE_OPACITY) { |
| 408 int opacity = animation_->CurrentValueBetween(0, 255); | 409 int opacity = animation_->CurrentValueBetween(0, 255); |
| 409 if (opacity == 0) { | 410 if (opacity == 0) { |
| 410 popup_->Hide(); | 411 popup_->Hide(); |
| 411 } else { | 412 } else { |
| 412 popup_->Show(); | 413 popup_->Show(); |
| 413 popup_->SetOpacity(opacity); | 414 popup_->SetOpacity(opacity); |
| 414 } | 415 } |
| 415 } else { | 416 } else { |
| 416 if (GetPopupRect(false).IsEmpty()) { | 417 if (GetPopupRect(false).IsEmpty()) { |
| 417 popup_->Hide(); | 418 popup_->Hide(); |
| 418 } else { | 419 } else { |
| 419 UpdateBounds(); | 420 UpdateBounds(); |
| 420 popup_->Show(); | 421 popup_->Show(); |
| 421 } | 422 } |
| 422 } | 423 } |
| 423 } | 424 } |
| 424 | 425 |
| 425 void FullscreenExitBubbleViews::AnimationEnded( | 426 void ExclusiveAccessBubbleViews::AnimationEnded( |
| 426 const gfx::Animation* animation) { | 427 const gfx::Animation* animation) { |
| 427 AnimationProgressed(animation); | 428 AnimationProgressed(animation); |
| 428 } | 429 } |
| 429 | 430 |
| 430 gfx::Rect FullscreenExitBubbleViews::GetPopupRect( | 431 gfx::Rect ExclusiveAccessBubbleViews::GetPopupRect( |
| 431 bool ignore_animation_state) const { | 432 bool ignore_animation_state) const { |
| 432 gfx::Size size(view_->GetPreferredSize()); | 433 gfx::Size size(view_->GetPreferredSize()); |
| 433 // NOTE: don't use the bounds of the root_view_. On linux GTK changing window | 434 // NOTE: don't use the bounds of the root_view_. On linux GTK changing window |
| 434 // size is async. Instead we use the size of the screen. | 435 // size is async. Instead we use the size of the screen. |
| 435 gfx::Screen* screen = | 436 gfx::Screen* screen = |
| 436 gfx::Screen::GetScreenFor(browser_view_->GetWidget()->GetNativeView()); | 437 gfx::Screen::GetScreenFor(browser_view_->GetWidget()->GetNativeView()); |
| 437 gfx::Rect screen_bounds = screen->GetDisplayNearestWindow( | 438 gfx::Rect screen_bounds = screen->GetDisplayNearestWindow( |
| 438 browser_view_->GetWidget()->GetNativeView()).bounds(); | 439 browser_view_->GetWidget()->GetNativeView()).bounds(); |
| 439 int x = screen_bounds.x() + (screen_bounds.width() - size.width()) / 2; | 440 int x = screen_bounds.x() + (screen_bounds.width() - size.width()) / 2; |
| 440 | 441 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 458 animated_attribute_ == ANIMATED_ATTRIBUTE_BOUNDS) { | 459 animated_attribute_ == ANIMATED_ATTRIBUTE_BOUNDS) { |
| 459 int total_height = size.height() + kPopupTopPx; | 460 int total_height = size.height() + kPopupTopPx; |
| 460 int popup_bottom = animation_->CurrentValueBetween(total_height, 0); | 461 int popup_bottom = animation_->CurrentValueBetween(total_height, 0); |
| 461 int y_offset = std::min(popup_bottom, kPopupTopPx); | 462 int y_offset = std::min(popup_bottom, kPopupTopPx); |
| 462 size.set_height(size.height() - popup_bottom + y_offset); | 463 size.set_height(size.height() - popup_bottom + y_offset); |
| 463 y -= y_offset; | 464 y -= y_offset; |
| 464 } | 465 } |
| 465 return gfx::Rect(gfx::Point(x, y), size); | 466 return gfx::Rect(gfx::Point(x, y), size); |
| 466 } | 467 } |
| 467 | 468 |
| 468 gfx::Point FullscreenExitBubbleViews::GetCursorScreenPoint() { | 469 gfx::Point ExclusiveAccessBubbleViews::GetCursorScreenPoint() { |
| 469 gfx::Point cursor_pos = gfx::Screen::GetScreenFor( | 470 gfx::Point cursor_pos = gfx::Screen::GetScreenFor( |
| 470 browser_view_->GetWidget()->GetNativeView())->GetCursorScreenPoint(); | 471 browser_view_->GetWidget()->GetNativeView())->GetCursorScreenPoint(); |
| 471 views::View::ConvertPointFromScreen(GetBrowserRootView(), &cursor_pos); | 472 views::View::ConvertPointFromScreen(GetBrowserRootView(), &cursor_pos); |
| 472 return cursor_pos; | 473 return cursor_pos; |
| 473 } | 474 } |
| 474 | 475 |
| 475 bool FullscreenExitBubbleViews::WindowContainsPoint(gfx::Point pos) { | 476 bool ExclusiveAccessBubbleViews::WindowContainsPoint(gfx::Point pos) { |
| 476 return GetBrowserRootView()->HitTestPoint(pos); | 477 return GetBrowserRootView()->HitTestPoint(pos); |
| 477 } | 478 } |
| 478 | 479 |
| 479 bool FullscreenExitBubbleViews::IsWindowActive() { | 480 bool ExclusiveAccessBubbleViews::IsWindowActive() { |
| 480 return browser_view_->GetWidget()->IsActive(); | 481 return browser_view_->GetWidget()->IsActive(); |
| 481 } | 482 } |
| 482 | 483 |
| 483 void FullscreenExitBubbleViews::Hide() { | 484 void ExclusiveAccessBubbleViews::Hide() { |
| 484 animation_->SetSlideDuration(kSlideOutDurationMs); | 485 animation_->SetSlideDuration(kSlideOutDurationMs); |
| 485 animation_->Hide(); | 486 animation_->Hide(); |
| 486 } | 487 } |
| 487 | 488 |
| 488 void FullscreenExitBubbleViews::Show() { | 489 void ExclusiveAccessBubbleViews::Show() { |
| 489 animation_->SetSlideDuration(kSlideInDurationMs); | 490 animation_->SetSlideDuration(kSlideInDurationMs); |
| 490 animation_->Show(); | 491 animation_->Show(); |
| 491 } | 492 } |
| 492 | 493 |
| 493 bool FullscreenExitBubbleViews::IsAnimating() { | 494 bool ExclusiveAccessBubbleViews::IsAnimating() { |
| 494 return animation_->is_animating(); | 495 return animation_->is_animating(); |
| 495 } | 496 } |
| 496 | 497 |
| 497 bool FullscreenExitBubbleViews::CanMouseTriggerSlideIn() const { | 498 bool ExclusiveAccessBubbleViews::CanMouseTriggerSlideIn() const { |
| 498 return !browser_view_->immersive_mode_controller()->IsEnabled(); | 499 return !browser_view_->immersive_mode_controller()->IsEnabled(); |
| 499 } | 500 } |
| 500 | 501 |
| 501 void FullscreenExitBubbleViews::Observe( | 502 void ExclusiveAccessBubbleViews::Observe( |
| 502 int type, | 503 int type, |
| 503 const content::NotificationSource& source, | 504 const content::NotificationSource& source, |
| 504 const content::NotificationDetails& details) { | 505 const content::NotificationDetails& details) { |
| 505 DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type); | 506 DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type); |
| 506 UpdateForImmersiveState(); | 507 UpdateForImmersiveState(); |
| 507 } | 508 } |
| 508 | 509 |
| 509 void FullscreenExitBubbleViews::OnWidgetVisibilityChanged( | 510 void ExclusiveAccessBubbleViews::OnWidgetVisibilityChanged( |
| 510 views::Widget* widget, | 511 views::Widget* widget, |
| 511 bool visible) { | 512 bool visible) { |
| 512 UpdateMouseWatcher(); | 513 UpdateMouseWatcher(); |
| 513 } | 514 } |
| OLD | NEW |