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

Side by Side Diff: ui/views/controls/webview/webview.h

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 (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 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/render_process_host_observer.h" 10 #include "content/public/browser/render_process_host_observer.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 bool EmbedsFullscreenWidget() const override; 124 bool EmbedsFullscreenWidget() const override;
125 125
126 // Overridden from content::WebContentsObserver: 126 // Overridden from content::WebContentsObserver:
127 void RenderViewReady() override; 127 void RenderViewReady() override;
128 void RenderViewDeleted(content::RenderViewHost* render_view_host) override; 128 void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
129 void RenderViewHostChanged(content::RenderViewHost* old_host, 129 void RenderViewHostChanged(content::RenderViewHost* old_host,
130 content::RenderViewHost* new_host) override; 130 content::RenderViewHost* new_host) override;
131 void WebContentsDestroyed() override; 131 void WebContentsDestroyed() override;
132 void DidShowFullscreenWidget(int routing_id) override; 132 void DidShowFullscreenWidget(int routing_id) override;
133 void DidDestroyFullscreenWidget(int routing_id) override; 133 void DidDestroyFullscreenWidget(int routing_id) override;
134 void DidToggleFullscreenModeForTab(bool entered_fullscreen) override; 134 void DidToggleFullscreenModeForTab(bool entered_fullscreen,
135 bool will_cause_resize) override;
135 void DidAttachInterstitialPage() override; 136 void DidAttachInterstitialPage() override;
136 void DidDetachInterstitialPage() override; 137 void DidDetachInterstitialPage() override;
137 // Workaround for MSVC++ linker bug/feature that requires 138 // Workaround for MSVC++ linker bug/feature that requires
138 // instantiation of the inline IPC::Listener methods in all translation units. 139 // instantiation of the inline IPC::Listener methods in all translation units.
139 void OnChannelConnected(int32 peer_id) override {} 140 void OnChannelConnected(int32 peer_id) override {}
140 void OnChannelError() override {} 141 void OnChannelError() override {}
141 void OnBadMessageReceived(const IPC::Message& message) override {} 142 void OnBadMessageReceived(const IPC::Message& message) override {}
142 void OnWebContentsFocused() override; 143 void OnWebContentsFocused() override;
143 144
144 private: 145 private:
(...skipping 26 matching lines...) Expand all
171 content::BrowserContext* browser_context_; 172 content::BrowserContext* browser_context_;
172 bool allow_accelerators_; 173 bool allow_accelerators_;
173 gfx::Size preferred_size_; 174 gfx::Size preferred_size_;
174 175
175 DISALLOW_COPY_AND_ASSIGN(WebView); 176 DISALLOW_COPY_AND_ASSIGN(WebView);
176 }; 177 };
177 178
178 } // namespace views 179 } // namespace views
179 180
180 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 181 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698