Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: webkit/glue/webview_impl.h

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/glue/webview.h ('k') | webkit/glue/webview_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 WEBKIT_GLUE_WEBVIEW_IMPL_H_ 5 #ifndef WEBKIT_GLUE_WEBVIEW_IMPL_H_
6 #define WEBKIT_GLUE_WEBVIEW_IMPL_H_ 6 #define WEBKIT_GLUE_WEBVIEW_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string>
10 #include <vector>
9 11
10 #include "Page.h" 12 #include "Page.h"
11 13
12 #include "base/basictypes.h" 14 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
14 #include "skia/ext/platform_canvas.h" 16 #include "skia/ext/platform_canvas.h"
15 #include "webkit/api/public/WebPoint.h" 17 #include "webkit/api/public/WebPoint.h"
16 #include "webkit/api/public/WebSize.h" 18 #include "webkit/api/public/WebSize.h"
17 #include "webkit/api/src/NotificationPresenterImpl.h" 19 #include "webkit/api/src/NotificationPresenterImpl.h"
18 #include "webkit/glue/back_forward_list_client_impl.h" 20 #include "webkit/glue/back_forward_list_client_impl.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // WebView methods: 80 // WebView methods:
79 virtual void InitializeMainFrame(); 81 virtual void InitializeMainFrame();
80 virtual bool ShouldClose(); 82 virtual bool ShouldClose();
81 virtual void ClosePage(); 83 virtual void ClosePage();
82 virtual WebViewDelegate* GetDelegate(); 84 virtual WebViewDelegate* GetDelegate();
83 virtual void SetTabKeyCyclesThroughElements(bool value); 85 virtual void SetTabKeyCyclesThroughElements(bool value);
84 virtual WebKit::WebFrame* GetMainFrame(); 86 virtual WebKit::WebFrame* GetMainFrame();
85 virtual WebKit::WebFrame* GetFocusedFrame(); 87 virtual WebKit::WebFrame* GetFocusedFrame();
86 virtual void SetFocusedFrame(WebKit::WebFrame* frame); 88 virtual void SetFocusedFrame(WebKit::WebFrame* frame);
87 virtual WebKit::WebFrame* GetFrameWithName(const WebKit::WebString& name); 89 virtual WebKit::WebFrame* GetFrameWithName(const WebKit::WebString& name);
88 virtual WebKit::WebFrame* GetPreviousFrameBefore(WebKit::WebFrame* frame, bool wrap); 90 virtual WebKit::WebFrame* GetPreviousFrameBefore(WebKit::WebFrame* frame,
89 virtual WebKit::WebFrame* GetNextFrameAfter(WebKit::WebFrame* frame, bool wrap ); 91 bool wrap);
92 virtual WebKit::WebFrame* GetNextFrameAfter(WebKit::WebFrame* frame,
93 bool wrap);
90 virtual void ClearFocusedNode(); 94 virtual void ClearFocusedNode();
91 virtual void StopLoading(); 95 virtual void StopLoading();
92 virtual void SetBackForwardListSize(int size); 96 virtual void SetBackForwardListSize(int size);
93 virtual void SetInitialFocus(bool reverse); 97 virtual void SetInitialFocus(bool reverse);
94 virtual bool DownloadImage(int id, const GURL& image_url, int image_size); 98 virtual bool DownloadImage(int id, const GURL& image_url, int image_size);
95 virtual WebKit::WebSettings* GetSettings(); 99 virtual WebKit::WebSettings* GetSettings();
96 virtual const std::wstring& GetInspectorSettings() const; 100 virtual const std::wstring& GetInspectorSettings() const;
97 virtual void SetInspectorSettings(const std::wstring& settings); 101 virtual void SetInspectorSettings(const std::wstring& settings);
98 virtual void SetPageEncoding(const std::wstring& encoding_name); 102 virtual void SetPageEncoding(const std::string& encoding_name);
99 virtual std::wstring GetMainFrameEncodingName(); 103 virtual std::string GetMainFrameEncodingName();
100 virtual void ZoomIn(bool text_only); 104 virtual void ZoomIn(bool text_only);
101 virtual void ZoomOut(bool text_only); 105 virtual void ZoomOut(bool text_only);
102 virtual void ResetZoom(); 106 virtual void ResetZoom();
103 virtual void CopyImageAt(int x, int y); 107 virtual void CopyImageAt(int x, int y);
104 virtual void InspectElement(int x, int y); 108 virtual void InspectElement(int x, int y);
105 virtual void ShowJavaScriptConsole(); 109 virtual void ShowJavaScriptConsole();
106 virtual void DragSourceCancelledAt( 110 virtual void DragSourceCancelledAt(
107 const WebKit::WebPoint& client_point, 111 const WebKit::WebPoint& client_point,
108 const WebKit::WebPoint& screen_point); 112 const WebKit::WebPoint& screen_point);
109 virtual void DragSourceEndedAt( 113 virtual void DragSourceEndedAt(
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 std::wstring inspector_settings_; 383 std::wstring inspector_settings_;
380 384
381 #if ENABLE(NOTIFICATIONS) 385 #if ENABLE(NOTIFICATIONS)
382 // The provider of desktop notifications; 386 // The provider of desktop notifications;
383 WebKit::NotificationPresenterImpl notification_presenter_; 387 WebKit::NotificationPresenterImpl notification_presenter_;
384 #endif 388 #endif
385 389
386 // HACK: current_input_event is for ChromeClientImpl::show(), until we can fix 390 // HACK: current_input_event is for ChromeClientImpl::show(), until we can fix
387 // WebKit to pass enough information up into ChromeClient::show() so we can 391 // WebKit to pass enough information up into ChromeClient::show() so we can
388 // decide if the window.open event was caused by a middle-mouse click 392 // decide if the window.open event was caused by a middle-mouse click
389 public: 393 public:
390 static const WebKit::WebInputEvent* current_input_event() { 394 static const WebKit::WebInputEvent* current_input_event() {
391 return g_current_input_event; 395 return g_current_input_event;
392 } 396 }
393 private: 397 private:
394 static const WebKit::WebInputEvent* g_current_input_event; 398 static const WebKit::WebInputEvent* g_current_input_event;
395 399
396 DISALLOW_COPY_AND_ASSIGN(WebViewImpl); 400 DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
397 }; 401 };
398 402
399 #endif // WEBKIT_GLUE_WEBVIEW_IMPL_H_ 403 #endif // WEBKIT_GLUE_WEBVIEW_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/glue/webview.h ('k') | webkit/glue/webview_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698