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

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

Issue 160169: Merge 21266 - This CL fixes issue 5996: Tooltip gets direction from Chrome la... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | webkit/glue/chrome_client_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/chrome_client_impl.h:r3734-4217,4606-5108,5177-5263
Merged /trunk/src/webkit/glue/chrome_client_impl.h:r21266
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_CHROME_CLIENT_IMPL_H_ 5 #ifndef WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
6 #define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_ 6 #define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 9
10 MSVC_PUSH_WARNING_LEVEL(0); 10 MSVC_PUSH_WARNING_LEVEL(0);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const; 110 virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
111 virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const; 111 virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
112 virtual PlatformWidget platformWindow() const; 112 virtual PlatformWidget platformWindow() const;
113 virtual void contentsSizeChanged(WebCore::Frame*, 113 virtual void contentsSizeChanged(WebCore::Frame*,
114 const WebCore::IntSize&) const; 114 const WebCore::IntSize&) const;
115 virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::Scroll View*) const { } 115 virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::Scroll View*) const { }
116 116
117 virtual void mouseDidMoveOverElement(const WebCore::HitTestResult& result, 117 virtual void mouseDidMoveOverElement(const WebCore::HitTestResult& result,
118 unsigned modifierFlags); 118 unsigned modifierFlags);
119 119
120 virtual void setToolTip(const WebCore::String& tooltip_text); 120 virtual void setToolTip(const WebCore::String& tooltip_text,
121 WebCore::TextDirection dir);
121 122
122 virtual void print(WebCore::Frame*); 123 virtual void print(WebCore::Frame*);
123 124
124 virtual void exceededDatabaseQuota(WebCore::Frame*, 125 virtual void exceededDatabaseQuota(WebCore::Frame*,
125 const WebCore::String& databaseName); 126 const WebCore::String& databaseName);
126 127
127 virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Ge olocation*) { } 128 virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Ge olocation*) { }
128 129
129 virtual void runOpenPanel(WebCore::Frame*, 130 virtual void runOpenPanel(WebCore::Frame*,
130 PassRefPtr<WebCore::FileChooser>); 131 PassRefPtr<WebCore::FileChooser>);
(...skipping 18 matching lines...) Expand all
149 bool toolbars_visible_; 150 bool toolbars_visible_;
150 bool statusbar_visible_; 151 bool statusbar_visible_;
151 bool scrollbars_visible_; 152 bool scrollbars_visible_;
152 bool menubar_visible_; 153 bool menubar_visible_;
153 bool resizable_; 154 bool resizable_;
154 // Set to true if the next SetCursor is to be ignored. 155 // Set to true if the next SetCursor is to be ignored.
155 bool ignore_next_set_cursor_; 156 bool ignore_next_set_cursor_;
156 }; 157 };
157 158
158 #endif // WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_ 159 #endif // WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/chrome_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698