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 #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/web_contents_delegate.h" | 10 #include "content/public/browser/web_contents_delegate.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; | 110 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; |
111 virtual gfx::Size GetPreferredSize() const OVERRIDE; | 111 virtual gfx::Size GetPreferredSize() const OVERRIDE; |
112 | 112 |
113 // Overridden from content::WebContentsDelegate: | 113 // Overridden from content::WebContentsDelegate: |
114 virtual void WebContentsFocused(content::WebContents* web_contents) OVERRIDE; | 114 virtual void WebContentsFocused(content::WebContents* web_contents) OVERRIDE; |
115 virtual bool EmbedsFullscreenWidget() const OVERRIDE; | 115 virtual bool EmbedsFullscreenWidget() const OVERRIDE; |
116 | 116 |
117 // Overridden from content::WebContentsObserver: | 117 // Overridden from content::WebContentsObserver: |
118 virtual void RenderViewDeleted( | 118 virtual void RenderViewDeleted( |
119 content::RenderViewHost* render_view_host) OVERRIDE; | 119 content::RenderViewHost* render_view_host) OVERRIDE; |
| 120 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; |
120 virtual void RenderViewHostChanged( | 121 virtual void RenderViewHostChanged( |
121 content::RenderViewHost* old_host, | 122 content::RenderViewHost* old_host, |
122 content::RenderViewHost* new_host) OVERRIDE; | 123 content::RenderViewHost* new_host) OVERRIDE; |
123 virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE; | 124 virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE; |
124 virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE; | 125 virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE; |
125 virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; | 126 virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; |
| 127 virtual void DidAttachInterstitialPage() OVERRIDE; |
| 128 virtual void DidDetachInterstitialPage() OVERRIDE; |
126 // Workaround for MSVC++ linker bug/feature that requires | 129 // Workaround for MSVC++ linker bug/feature that requires |
127 // instantiation of the inline IPC::Listener methods in all translation units. | 130 // instantiation of the inline IPC::Listener methods in all translation units. |
128 virtual void OnChannelConnected(int32 peer_id) OVERRIDE {} | 131 virtual void OnChannelConnected(int32 peer_id) OVERRIDE {} |
129 virtual void OnChannelError() OVERRIDE {} | 132 virtual void OnChannelError() OVERRIDE {} |
130 virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE {} | 133 virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE {} |
131 | 134 |
132 private: | 135 private: |
133 void AttachWebContents(); | 136 void AttachWebContents(); |
134 void DetachWebContents(); | 137 void DetachWebContents(); |
135 void ReattachForFullscreenChange(bool enter_fullscreen); | 138 void ReattachForFullscreenChange(bool enter_fullscreen); |
(...skipping 16 matching lines...) Expand all Loading... |
152 content::BrowserContext* browser_context_; | 155 content::BrowserContext* browser_context_; |
153 bool allow_accelerators_; | 156 bool allow_accelerators_; |
154 gfx::Size preferred_size_; | 157 gfx::Size preferred_size_; |
155 | 158 |
156 DISALLOW_COPY_AND_ASSIGN(WebView); | 159 DISALLOW_COPY_AND_ASSIGN(WebView); |
157 }; | 160 }; |
158 | 161 |
159 } // namespace views | 162 } // namespace views |
160 | 163 |
161 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ | 164 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ |
OLD | NEW |