Chromium Code Reviews| Index: views/controls/textfield/textfield.h |
| diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h |
| index d171eb5b5edaa2a2aba9358a7b93730296d01353..a433ea7c5270a19181a1899cc630da4030f720b5 100644 |
| --- a/views/controls/textfield/textfield.h |
| +++ b/views/controls/textfield/textfield.h |
| @@ -60,10 +60,10 @@ class Textfield : public View { |
| int repeat_count() const { return repeat_count_; } |
| unsigned int flags() const { return flags_; } |
| #else |
| - explicit Keystroke(GdkEventKey* event) |
| - : event_(*event) { |
| + explicit Keystroke(const KeyEvent* event) |
| + : event_(event) { |
| } |
|
oshima
2010/12/15 17:29:06
This seems to be safe as Keystroke is used on stac
|
| - const GdkEventKey* event() const { return &event_; } |
| + const GdkEventKey* event() const { return event_->native_event(); } |
|
rjkroege
2010/12/15 21:23:31
I think we should exclude this in a touchui=1 cont
oshima
2010/12/16 01:15:19
we still need this to compile.
|
| #endif |
| app::KeyboardCode GetKeyboardCode() const; |
| bool IsControlHeld() const; |
| @@ -76,7 +76,7 @@ class Textfield : public View { |
| int repeat_count_; |
| unsigned int flags_; |
| #else |
| - GdkEventKey event_; |
| + const KeyEvent* event_; |
| #endif |
| DISALLOW_COPY_AND_ASSIGN(Keystroke); |
| @@ -230,6 +230,9 @@ class Textfield : public View { |
| gfx::NativeView GetTestingHandle() const { |
| return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL; |
| } |
| + NativeTextfieldWrapper* native_wrapper() const { |
| + return native_wrapper_; |
| + } |
| #endif |
| // Overridden from View: |