| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 // processed. Default is false. | 82 // processed. Default is false. |
| 83 void set_allow_accelerators(bool allow_accelerators) { | 83 void set_allow_accelerators(bool allow_accelerators) { |
| 84 allow_accelerators_ = allow_accelerators; | 84 allow_accelerators_ = allow_accelerators; |
| 85 } | 85 } |
| 86 | 86 |
| 87 // Sets the preferred size. If empty, View's implementation of | 87 // Sets the preferred size. If empty, View's implementation of |
| 88 // GetPreferredSize() is used. | 88 // GetPreferredSize() is used. |
| 89 void SetPreferredSize(const gfx::Size& preferred_size); | 89 void SetPreferredSize(const gfx::Size& preferred_size); |
| 90 | 90 |
| 91 // Overridden from View: | 91 // Overridden from View: |
| 92 virtual const char* GetClassName() const OVERRIDE; | 92 virtual const char* GetClassName() const override; |
| 93 virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; | 93 virtual ui::TextInputClient* GetTextInputClient() override; |
| 94 | 94 |
| 95 protected: | 95 protected: |
| 96 // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns | 96 // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns |
| 97 // the previously owned WebContents. | 97 // the previously owned WebContents. |
| 98 scoped_ptr<content::WebContents> SwapWebContents( | 98 scoped_ptr<content::WebContents> SwapWebContents( |
| 99 scoped_ptr<content::WebContents> new_web_contents); | 99 scoped_ptr<content::WebContents> new_web_contents); |
| 100 | 100 |
| 101 // Overridden from View: | 101 // Overridden from View: |
| 102 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; | 102 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; |
| 103 virtual void ViewHierarchyChanged( | 103 virtual void ViewHierarchyChanged( |
| 104 const ViewHierarchyChangedDetails& details) OVERRIDE; | 104 const ViewHierarchyChangedDetails& details) override; |
| 105 virtual bool SkipDefaultKeyEventProcessing( | 105 virtual bool SkipDefaultKeyEventProcessing( |
| 106 const ui::KeyEvent& event) OVERRIDE; | 106 const ui::KeyEvent& event) override; |
| 107 virtual void OnFocus() OVERRIDE; | 107 virtual void OnFocus() override; |
| 108 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; | 108 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override; |
| 109 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; | 109 virtual void GetAccessibleState(ui::AXViewState* state) override; |
| 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 RenderProcessGone(base::TerminationStatus status) override; |
| 121 virtual void RenderViewHostChanged( | 121 virtual void RenderViewHostChanged( |
| 122 content::RenderViewHost* old_host, | 122 content::RenderViewHost* old_host, |
| 123 content::RenderViewHost* new_host) OVERRIDE; | 123 content::RenderViewHost* new_host) override; |
| 124 virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE; | 124 virtual void DidShowFullscreenWidget(int routing_id) override; |
| 125 virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE; | 125 virtual void DidDestroyFullscreenWidget(int routing_id) override; |
| 126 virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; | 126 virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) override; |
| 127 virtual void DidAttachInterstitialPage() OVERRIDE; | 127 virtual void DidAttachInterstitialPage() override; |
| 128 virtual void DidDetachInterstitialPage() OVERRIDE; | 128 virtual void DidDetachInterstitialPage() override; |
| 129 // Workaround for MSVC++ linker bug/feature that requires | 129 // Workaround for MSVC++ linker bug/feature that requires |
| 130 // instantiation of the inline IPC::Listener methods in all translation units. | 130 // instantiation of the inline IPC::Listener methods in all translation units. |
| 131 virtual void OnChannelConnected(int32 peer_id) OVERRIDE {} | 131 virtual void OnChannelConnected(int32 peer_id) override {} |
| 132 virtual void OnChannelError() OVERRIDE {} | 132 virtual void OnChannelError() override {} |
| 133 virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE {} | 133 virtual void OnBadMessageReceived(const IPC::Message& message) override {} |
| 134 | 134 |
| 135 private: | 135 private: |
| 136 void AttachWebContents(); | 136 void AttachWebContents(); |
| 137 void DetachWebContents(); | 137 void DetachWebContents(); |
| 138 void ReattachForFullscreenChange(bool enter_fullscreen); | 138 void ReattachForFullscreenChange(bool enter_fullscreen); |
| 139 void NotifyMaybeTextInputClientChanged(); | 139 void NotifyMaybeTextInputClientChanged(); |
| 140 | 140 |
| 141 // Create a regular or test web contents (based on whether we're running | 141 // Create a regular or test web contents (based on whether we're running |
| 142 // in a unit test or not). | 142 // in a unit test or not). |
| 143 content::WebContents* CreateWebContents( | 143 content::WebContents* CreateWebContents( |
| (...skipping 11 matching lines...) Expand all Loading... |
| 155 content::BrowserContext* browser_context_; | 155 content::BrowserContext* browser_context_; |
| 156 bool allow_accelerators_; | 156 bool allow_accelerators_; |
| 157 gfx::Size preferred_size_; | 157 gfx::Size preferred_size_; |
| 158 | 158 |
| 159 DISALLOW_COPY_AND_ASSIGN(WebView); | 159 DISALLOW_COPY_AND_ASSIGN(WebView); |
| 160 }; | 160 }; |
| 161 | 161 |
| 162 } // namespace views | 162 } // namespace views |
| 163 | 163 |
| 164 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ | 164 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ |
| OLD | NEW |