summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chromeos/dom_ui/login/login_ui.cc3
-rw-r--r--chrome/browser/dom_ui/keyboard_ui.cc1
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_views.cc20
-rw-r--r--chrome/browser/ui/views/dropdown_bar_host_gtk.cc4
-rw-r--r--views/focus/accelerator_handler_touch.cc6
-rw-r--r--views/native_types.h13
-rw-r--r--views/touchui/gesture_manager.cc12
-rw-r--r--views/view_unittest.cc8
8 files changed, 31 insertions, 36 deletions
diff --git a/chrome/browser/chromeos/dom_ui/login/login_ui.cc b/chrome/browser/chromeos/dom_ui/login/login_ui.cc
index ff9a314..9cc6b5a 100644
--- a/chrome/browser/chromeos/dom_ui/login/login_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/login/login_ui.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/chromeos/dom_ui/login/authenticator_facade_cros.h"
#include "chrome/browser/chromeos/dom_ui/login/login_ui.h"
#include "chrome/browser/chromeos/dom_ui/login/login_ui_helpers.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
@@ -158,7 +157,7 @@ LoginUI::LoginUI(TabContents* contents)
LoginUIHTMLSource* html_source =
new LoginUIHTMLSource(MessageLoop::current());
- contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+ contents->profile->GetChromeURLDataManager()->AddDataSource(html_source);
}
} // namespace chromeos
diff --git a/chrome/browser/dom_ui/keyboard_ui.cc b/chrome/browser/dom_ui/keyboard_ui.cc
index a85b92d..ea770e4 100644
--- a/chrome/browser/dom_ui/keyboard_ui.cc
+++ b/chrome/browser/dom_ui/keyboard_ui.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/url_constants.h"
#include "grit/browser_resources.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index 5c32bc7..77955d0 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -59,7 +59,7 @@ int WebInputEventFlagsFromViewsEvent(const views::Event& event) {
WebKit::WebTouchPoint::State TouchPointStateFromEvent(
const views::TouchEvent* event) {
- switch (event->type()) {
+ switch (event->GetType()) {
case ui::ET_TOUCH_PRESSED:
return WebKit::WebTouchPoint::StatePressed;
case ui::ET_TOUCH_RELEASED:
@@ -75,7 +75,7 @@ WebKit::WebTouchPoint::State TouchPointStateFromEvent(
WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
const views::TouchEvent* event) {
- switch (event->type()) {
+ switch (event->GetType()) {
case ui::ET_TOUCH_PRESSED:
return WebKit::WebInputEvent::TouchStart;
case ui::ET_TOUCH_RELEASED:
@@ -503,7 +503,7 @@ bool RenderWidgetHostViewViews::OnMouseWheel(const views::MouseWheelEvent& e) {
wmwe.button = WebKit::WebMouseEvent::ButtonNone;
// TODO(sadrul): How do we determine if it's a horizontal scroll?
- wmwe.deltaY = e.offset();
+ wmwe.deltaY = e.GetOffset();
wmwe.wheelTicksY = wmwe.deltaY > 0 ? 1 : -1;
GetRenderWidgetHost()->ForwardWheelEvent(wmwe);
@@ -529,12 +529,12 @@ bool RenderWidgetHostViewViews::OnKeyPressed(const views::KeyEvent &e) {
NativeWebKeyboardEvent wke;
wke.type = WebKit::WebInputEvent::RawKeyDown;
- wke.windowsKeyCode = e.key_code();
+ wke.windowsKeyCode = e.GetKeyCode();
wke.setKeyIdentifierFromWindowsKeyCode();
wke.text[0] = wke.unmodifiedText[0] =
static_cast<unsigned short>(gdk_keyval_to_unicode(
- ui::GdkKeyCodeForWindowsKeyCode(e.key_code(),
+ ui::GdkKeyCodeForWindowsKeyCode(e.GetKeyCode(),
e.IsShiftDown() ^ e.IsCapsLockDown())));
wke.modifiers = WebInputEventFlagsFromViewsEvent(e);
@@ -552,7 +552,7 @@ bool RenderWidgetHostViewViews::OnKeyReleased(const views::KeyEvent &e) {
NativeWebKeyboardEvent wke;
wke.type = WebKit::WebInputEvent::KeyUp;
- wke.windowsKeyCode = e.key_code();
+ wke.windowsKeyCode = e.GetKeyCode();
wke.setKeyIdentifierFromWindowsKeyCode();
ForwardKeyboardEvent(wke);
@@ -683,7 +683,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
WebKit::WebTouchPoint* point = NULL;
TouchStatus status = TOUCH_STATUS_UNKNOWN;
- switch (e.type()) {
+ switch (e.GetType()) {
case ui::ET_TOUCH_PRESSED:
// Add a new touch point.
if (touch_event_.touchPointsLength <
@@ -717,7 +717,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
break;
}
default:
- DLOG(WARNING) << "Unknown touch event " << e.type();
+ DLOG(WARNING) << "Unknown touch event " << e.GetType();
break;
}
@@ -755,7 +755,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
host_->ForwardTouchEvent(touch_event_);
// If the touch was released, then remove it from the list of touch points.
- if (e.type() == ui::ET_TOUCH_RELEASED) {
+ if (e.GetType() == ui::ET_TOUCH_RELEASED) {
--touch_event_.touchPointsLength;
for (int i = point - touch_event_.touchPoints;
i < touch_event_.touchPointsLength;
@@ -764,7 +764,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
}
if (touch_event_.touchPointsLength == 0)
status = TOUCH_STATUS_END;
- } else if (e.type() == ui::ET_TOUCH_CANCELLED) {
+ } else if (e.GetType() == ui::ET_TOUCH_CANCELLED) {
status = TOUCH_STATUS_CANCEL;
}
diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
index 00a03f1c..bf97697 100644
--- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
@@ -37,12 +37,12 @@ NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent(
// Refactor and eliminate the dup code.
NativeWebKeyboardEvent wke;
wke.type = WebKit::WebInputEvent::KeyDown;
- wke.windowsKeyCode = key_event.key_code();
+ wke.windowsKeyCode = key_event.GetKeyCode();
wke.setKeyIdentifierFromWindowsKeyCode();
wke.text[0] = wke.unmodifiedText[0] =
static_cast<unsigned short>(gdk_keyval_to_unicode(
- ui::GdkKeyCodeForWindowsKeyCode(key_event.key_code(),
+ ui::GdkKeyCodeForWindowsKeyCode(key_event.GetKeyCode(),
key_event.IsShiftDown() ^ key_event.IsCapsLockDown())));
return wke;
#else
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index 9b588c1..65cc2e7 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -99,7 +99,7 @@ bool DispatchX2Event(RootView* root, XEvent* xev) {
if (!touch_event) {
// Show the cursor, and decide whether or not the cursor should be
// automatically hidden after a certain time of inactivity.
- int button_flags = mouseev.flags() & (ui::EF_RIGHT_BUTTON_DOWN |
+ int button_flags = mouseev.GetFlags() & (ui::EF_RIGHT_BUTTON_DOWN |
ui::EF_MIDDLE_BUTTON_DOWN | ui::EF_LEFT_BUTTON_DOWN);
bool start_timer = false;
@@ -130,7 +130,7 @@ bool DispatchX2Event(RootView* root, XEvent* xev) {
root->OnMouseReleased(mouseev, false);
return true;
case XI_Motion: {
- if (mouseev.type() == ui::ET_MOUSE_DRAGGED) {
+ if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) {
return root->OnMouseDragged(mouseev);
} else {
root->OnMouseMoved(mouseev);
@@ -188,7 +188,7 @@ bool DispatchXEvent(XEvent* xev) {
case MotionNotify: {
MouseEvent mouseev(xev);
- if (mouseev.type() == ui::ET_MOUSE_DRAGGED) {
+ if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) {
return root->OnMouseDragged(mouseev);
} else {
root->OnMouseMoved(mouseev);
diff --git a/views/native_types.h b/views/native_types.h
index d61ca96..abea52e 100644
--- a/views/native_types.h
+++ b/views/native_types.h
@@ -8,21 +8,18 @@
#include "ui/gfx/native_widget_types.h"
-#if defined(TOUCH_UI)
-typedef union _XEvent XEvent;
-#elif defined(OS_LINUX)
-typedef union _GdkEvent GdkEvent;
-#endif
-
namespace views {
#if defined(OS_WIN)
typedef MSG NativeEvent;
#endif
+#if defined(OS_LINUX)
+typedef union _GdkEvent GdkEvent;
+typedef GdkEvent* NativeEvent;
+#endif
#if defined(TOUCH_UI)
+typedef union _XEvent XEvent;
typedef XEvent* NativeEvent;
-#elif defined(OS_LINUX)
-typedef GdkEvent* NativeEvent;
#endif
} // namespace views
diff --git a/views/touchui/gesture_manager.cc b/views/touchui/gesture_manager.cc
index 2d6c7d0..bc4fdd5 100644
--- a/views/touchui/gesture_manager.cc
+++ b/views/touchui/gesture_manager.cc
@@ -30,26 +30,26 @@ bool GestureManager::ProcessTouchEventForGesture(const TouchEvent& event,
// appear in a subsequent CL. This interim version permits verifying that the
// event distribution code works by turning all touch inputs into
// mouse approximations.
- if (event.type() == ui::ET_TOUCH_PRESSED) {
+ if (event.GetType() == ui::ET_TOUCH_PRESSED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchPressed";
MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, event.x(), event.y(),
- event.flags());
+ event.GetFlags());
source->OnMousePressed(mouse_event);
return true;
}
- if (event.type() == ui::ET_TOUCH_RELEASED) {
+ if (event.GetType() == ui::ET_TOUCH_RELEASED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchReleased";
MouseEvent mouse_event(ui::ET_MOUSE_RELEASED, event.x(), event.y(),
- event.flags());
+ event.GetFlags());
source->OnMouseReleased(mouse_event, false);
return true;
}
- if (event.type() == ui::ET_TOUCH_MOVED) {
+ if (event.GetType() == ui::ET_TOUCH_MOVED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchMotion";
MouseEvent mouse_event(ui::ET_MOUSE_DRAGGED, event.x(), event.y(),
- event.flags());
+ event.GetFlags());
source->OnMouseDragged(mouse_event);
return true;
}
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 111554b..bee547d 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -415,7 +415,7 @@ bool MockGestureManager::ProcessTouchEventForGesture(
dispatched_synthetic_event_ = false;
return false;
}
- last_touch_event_ = event.type();
+ last_touch_event_ = event.GetType();
last_view_ = source;
previously_handled_flag_ = status != View::TOUCH_STATUS_UNKNOWN;
dispatched_synthetic_event_ = true;
@@ -426,15 +426,15 @@ MockGestureManager::MockGestureManager() {
}
View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
- last_touch_event_type_ = event.type();
+ last_touch_event_type_ = event.GetType();
location_.SetPoint(event.x(), event.y());
if (!in_touch_sequence_) {
- if (event.type() == ui::ET_TOUCH_PRESSED) {
+ if (event.GetType() == ui::ET_TOUCH_PRESSED) {
in_touch_sequence_ = true;
return TOUCH_STATUS_START;
}
} else {
- if (event.type() == ui::ET_TOUCH_RELEASED) {
+ if (event.GetType() == ui::ET_TOUCH_RELEASED) {
in_touch_sequence_ = false;
return TOUCH_STATUS_END;
}
generated by cgit v1.1 at 2025-02-01 02:08:43 +0000