| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 virtual void RenderViewHostChanged( | 120 virtual void RenderViewHostChanged( |
| 121 content::RenderViewHost* old_host, | 121 content::RenderViewHost* old_host, |
| 122 content::RenderViewHost* new_host) OVERRIDE; | 122 content::RenderViewHost* new_host) OVERRIDE; |
| 123 virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE; | 123 virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE; |
| 124 virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE; | 124 virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE; |
| 125 virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; | 125 virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; |
| 126 // Workaround for MSVC++ linker bug/feature that requires | 126 // Workaround for MSVC++ linker bug/feature that requires |
| 127 // instantiation of the inline IPC::Listener methods in all translation units. | 127 // instantiation of the inline IPC::Listener methods in all translation units. |
| 128 virtual void OnChannelConnected(int32 peer_id) OVERRIDE {} | 128 virtual void OnChannelConnected(int32 peer_id) OVERRIDE {} |
| 129 virtual void OnChannelError() OVERRIDE {} | 129 virtual void OnChannelError() OVERRIDE {} |
| 130 virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE {} |
| 130 | 131 |
| 131 private: | 132 private: |
| 132 void AttachWebContents(); | 133 void AttachWebContents(); |
| 133 void DetachWebContents(); | 134 void DetachWebContents(); |
| 134 void ReattachForFullscreenChange(bool enter_fullscreen); | 135 void ReattachForFullscreenChange(bool enter_fullscreen); |
| 135 void NotifyMaybeTextInputClientChanged(); | 136 void NotifyMaybeTextInputClientChanged(); |
| 136 | 137 |
| 137 // Create a regular or test web contents (based on whether we're running | 138 // Create a regular or test web contents (based on whether we're running |
| 138 // in a unit test or not). | 139 // in a unit test or not). |
| 139 content::WebContents* CreateWebContents( | 140 content::WebContents* CreateWebContents( |
| (...skipping 11 matching lines...) Expand all Loading... |
| 151 content::BrowserContext* browser_context_; | 152 content::BrowserContext* browser_context_; |
| 152 bool allow_accelerators_; | 153 bool allow_accelerators_; |
| 153 gfx::Size preferred_size_; | 154 gfx::Size preferred_size_; |
| 154 | 155 |
| 155 DISALLOW_COPY_AND_ASSIGN(WebView); | 156 DISALLOW_COPY_AND_ASSIGN(WebView); |
| 156 }; | 157 }; |
| 157 | 158 |
| 158 } // namespace views | 159 } // namespace views |
| 159 | 160 |
| 160 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ | 161 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ |
| OLD | NEW |