Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: components/guest_view/browser/guest_view_base.cc

Issue 1488653002: Fix scroll restoration when exiting fullscreen mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Trying to fix test broken on Mac Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/guest_view/browser/guest_view_base.h" 5 #include "components/guest_view/browser/guest_view_base.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "components/guest_view/browser/guest_view_event.h" 9 #include "components/guest_view/browser/guest_view_event.h"
10 #include "components/guest_view/browser/guest_view_manager.h" 10 #include "components/guest_view/browser/guest_view_manager.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 Destroy(); 73 Destroy();
74 } 74 }
75 75
76 void RenderProcessGone(base::TerminationStatus status) override { 76 void RenderProcessGone(base::TerminationStatus status) override {
77 if (destroyed_) 77 if (destroyed_)
78 return; 78 return;
79 // If the embedder process is destroyed, then destroy the guest. 79 // If the embedder process is destroyed, then destroy the guest.
80 Destroy(); 80 Destroy();
81 } 81 }
82 82
83 void DidToggleFullscreenModeForTab(bool entered_fullscreen) override { 83 void DidToggleFullscreenModeForTab(bool entered_fullscreen,
84 bool will_cause_resize) override {
84 if (destroyed_) 85 if (destroyed_)
85 return; 86 return;
86 87
87 is_fullscreen_ = entered_fullscreen; 88 is_fullscreen_ = entered_fullscreen;
88 guest_->EmbedderFullscreenToggled(is_fullscreen_); 89 guest_->EmbedderFullscreenToggled(is_fullscreen_);
89 } 90 }
90 91
91 void MainFrameWasResized(bool width_changed) override { 92 void MainFrameWasResized(bool width_changed) override {
92 if (destroyed_ || !web_contents()->GetDelegate()) 93 if (destroyed_ || !web_contents()->GetDelegate())
93 return; 94 return;
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 872
872 void GuestViewBase::UpdateGuestSize(const gfx::Size& new_size, 873 void GuestViewBase::UpdateGuestSize(const gfx::Size& new_size,
873 bool due_to_auto_resize) { 874 bool due_to_auto_resize) {
874 if (due_to_auto_resize) 875 if (due_to_auto_resize)
875 GuestSizeChangedDueToAutoSize(guest_size_, new_size); 876 GuestSizeChangedDueToAutoSize(guest_size_, new_size);
876 DispatchOnResizeEvent(guest_size_, new_size); 877 DispatchOnResizeEvent(guest_size_, new_size);
877 guest_size_ = new_size; 878 guest_size_ = new_size;
878 } 879 }
879 880
880 } // namespace guest_view 881 } // namespace guest_view
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698