diff options
| -rw-r--r-- | chrome/renderer/render_view.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 6 | ||||
| -rw-r--r-- | webkit/glue/chrome_client_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webview_delegate.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webwidget_delegate.h | 6 |
5 files changed, 12 insertions, 14 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 112ef78..919a248 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1804,7 +1804,7 @@ WebView* RenderView::CreateWebView(WebView* webview, bool user_gesture) { NULL, waitable_event, routing_id_, prefs, shared_popup_counter_, routing_id); - view->set_opened_by_user_gesture(user_gesture); + view->opened_by_user_gesture_ = user_gesture; // Copy over the alternate error page URL so we can have alt error pages in // the new render view (we don't need the browser to send the URL back down). @@ -1949,7 +1949,7 @@ void RenderView::Show(WebWidget* webwidget, WindowOpenDisposition disposition) { // that's okay. It'll be ignored if disposition is not NEW_POPUP, or the // browser process will impose a default position otherwise. Send(new ViewHostMsg_ShowView(opener_id_, routing_id_, disposition, - initial_pos_, WasOpenedByUserGesture(NULL))); + initial_pos_, opened_by_user_gesture_)); } void RenderView::CloseWidgetSoon(WebWidget* webwidget) { @@ -2281,7 +2281,7 @@ void RenderView::ReportFindInPageSelection(int request_id, false)); } -bool RenderView::WasOpenedByUserGesture(WebView* webview) const { +bool RenderView::WasOpenedByUserGesture() const { return opened_by_user_gesture_; } diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 17ae772..65fca92 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -300,7 +300,7 @@ class RenderView : public RenderWidget, virtual void ReportFindInPageSelection(int request_id, int active_match_ordinal, const WebKit::WebRect& selection); - virtual bool WasOpenedByUserGesture(WebView* webview) const; + virtual bool WasOpenedByUserGesture() const; virtual void SpellCheck(const std::wstring& word, int& misspell_location, int& misspell_length); virtual void SetInputMethodState(bool enabled); @@ -597,10 +597,6 @@ class RenderView : public RenderWidget, // UI that is going to be hosted by this RenderView. void CreateDevToolsClient(); - void set_opened_by_user_gesture(bool value) { - opened_by_user_gesture_ = value; - } - // Called by RenderWidget after it paints. virtual void DidPaint(); diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index 573a3b2..9a823a9 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -169,9 +169,9 @@ WebCore::Page* ChromeClientImpl::createWindow( if (!delegate) return NULL; - bool userGesture = frame->script()->processingUserGesture(); + bool user_gesture = frame->script()->processingUserGesture(); WebViewImpl* new_view = static_cast<WebViewImpl*>( - delegate->CreateWebView(webview_, userGesture)); + delegate->CreateWebView(webview_, user_gesture)); if (!new_view) return NULL; @@ -211,7 +211,7 @@ void ChromeClientImpl::show() { !scrollbars_visible_ || !menubar_visible_ || !resizable_ || - !delegate->WasOpenedByUserGesture(webview_); + !delegate->WasOpenedByUserGesture(); WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; if (as_popup) diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 27036db..29c31be 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -159,7 +159,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { } // Returns whether this WebView was opened by a user gesture. - virtual bool WasOpenedByUserGesture(WebView* webview) const { + virtual bool WasOpenedByUserGesture() const { return true; } diff --git a/webkit/glue/webwidget_delegate.h b/webkit/glue/webwidget_delegate.h index 5b8fbbd0..9dc79b3 100644 --- a/webkit/glue/webwidget_delegate.h +++ b/webkit/glue/webwidget_delegate.h @@ -54,8 +54,10 @@ class WebWidgetDelegate { // This method is called to instruct the window containing the WebWidget to // show itself as the topmost window. This method is only used after a // successful call to CreateWebWidget. |disposition| indicates how this new - // window should be displayed, but generally only means something for WebViews. - virtual void Show(WebWidget* webwidget, WindowOpenDisposition disposition) = 0; + // window should be displayed, but generally only means something for + // WebViews. + virtual void Show(WebWidget* webwidget, + WindowOpenDisposition disposition) = 0; // Used for displaying HTML popup menus on Mac OS X (other platforms will use // Show() above). |bounds| represents the positioning on the screen (in WebKit |