More WebView / WebViewDelegate cleanup.

webkit/glue/webview_impl.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_GLUE_WEBVIEW_IMPL_H_
 #define WEBKIT_GLUE_WEBVIEW_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "Page.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebSize.h"
+#include "webkit/api/public/WebString.h"
 #include "webkit/api/src/NotificationPresenterImpl.h"
 #include "webkit/glue/back_forward_list_client_impl.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/context_menu_client_impl.h"
 #include "webkit/glue/dragclient_impl.h"
 #include "webkit/glue/editor_client_impl.h"
 #include "webkit/glue/inspector_client_impl.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
@@ skipping 94 matching lines @@
       const WebKit::WebPoint& client_point,
       const WebKit::WebPoint& screen_point,
       WebKit::WebDragOperationsMask operations_allowed);
   virtual void dragTargetDragLeave();
   virtual void dragTargetDrop(
       const WebKit::WebPoint& client_point,
       const WebKit::WebPoint& screen_point);
   virtual int dragIdentity();
   virtual bool setDropEffect(bool accept);
   virtual void inspectElementAt(const WebKit::WebPoint& point);
+  virtual WebKit::WebString inspectorSettings() const;
+  virtual void setInspectorSettings(const WebKit::WebString& settings);
 
   // WebView methods:
   virtual WebViewDelegate* GetDelegate();
-  virtual const std::wstring& GetInspectorSettings() const;
-  virtual void SetInspectorSettings(const std::wstring& settings);
   virtual void AutofillSuggestionsForNode(
       int64 node_id,
       const std::vector<std::wstring>& suggestions,
       int default_suggestion_index);
   virtual void HideAutofillPopup();
   virtual void SetIgnoreInputEvents(bool new_value);
   virtual WebDevToolsAgent* GetWebDevToolsAgent();
   WebDevToolsAgentImpl* GetWebDevToolsAgentImpl();
   virtual void MediaPlayerActionAt(int x,
                                    int y,
@@ skipping 94 matching lines @@
       WebKit::WebDragOperationsMask drag_source_operation_mask);
 
   // Hides the autocomplete popup if it is showing.
   void HideAutoCompletePopup();
   void AutoCompletePopupDidHide();
 
   // Converts |x|, |y| from window coordinates to contents coordinates and gets
   // the underlying Node for them.
   WebCore::Node* GetNodeForWindowPos(int x, int y);
 
-  virtual void SetSpellingPanelVisibility(bool is_visible);
-  virtual bool GetSpellingPanelVisibility();
-
 #if ENABLE(NOTIFICATIONS)
   // Returns the provider of desktop notifications.
   WebKit::NotificationPresenterImpl* GetNotificationPresenter();
 #endif
 
   // Tries to scroll a frame or any parent of a frame. Returns true if the view
   // was scrolled.
   bool PropagateScroll(WebCore::ScrollDirection scroll_direction,
                        WebCore::ScrollGranularity scroll_granularity);
 
@@ skipping 125 matching lines @@
   bool autocomplete_popup_showing_;
 
   // The autocomplete client.
   scoped_ptr<AutocompletePopupMenuClient> autocomplete_popup_client_;
 
   scoped_ptr<WebDevToolsAgentImpl> devtools_agent_;
 
   // Whether the webview is rendering transparently.
   bool is_transparent_;
 
-  // Whether the spelling panel is currently being displayed or not.
-  bool spelling_panel_is_visible_;
-
   // Whether the user can press tab to focus links.
   bool tabs_to_links_;
 
   // Inspector settings.
-  std::wstring inspector_settings_;
+  WebKit::WebString inspector_settings_;
 
 #if ENABLE(NOTIFICATIONS)
   // The provider of desktop notifications;
   WebKit::NotificationPresenterImpl notification_presenter_;
 #endif
 
   // HACK: current_input_event is for ChromeClientImpl::show(), until we can fix
   // WebKit to pass enough information up into ChromeClient::show() so we can
   // decide if the window.open event was caused by a middle-mouse click
  public:
   static const WebKit::WebInputEvent* current_input_event() {
     return g_current_input_event;
   }
  private:
   static const WebKit::WebInputEvent* g_current_input_event;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_IMPL_H_