Update to Chromium revision 131752.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@587 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-04-11 19:37:06 +00:00
parent 9d200c109a
commit b061ea934e
5 changed files with 15 additions and 13 deletions

View File

@@ -30,7 +30,7 @@
#include "ui/base/win/ime_input.h"
#endif
#if defined(TOOLKIT_USES_GTK)
#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h> // NOLINT(build/include_order)
#endif
@@ -186,7 +186,7 @@ class WebWidgetHost {
virtual void SetFocus(bool enable);
protected:
#elif defined(TOOLKIT_USES_GTK)
#elif defined(TOOLKIT_GTK)
public:
// ---------------------------------------------------------------------------
@@ -284,7 +284,7 @@ class WebWidgetHost {
WebKit::WebRect caret_bounds_;
#endif
#if defined(TOOLKIT_USES_GTK)
#if defined(TOOLKIT_GTK)
// Since GtkWindow resize is asynchronous, we have to stash the dimensions,
// so that the backing store doesn't have to wait for sizing to take place.
gfx::Size logical_size_;