projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
views
/
widget
/
widget_interactive_uitest.cc
diff --git
a/src/ui/views/widget/widget_interactive_uitest.cc
b/src/ui/views/widget/widget_interactive_uitest.cc
index
68d646c
..
c37236e
100644
(file)
--- a/
src/ui/views/widget/widget_interactive_uitest.cc
+++ b/
src/ui/views/widget/widget_interactive_uitest.cc
@@
-43,11
+43,11
@@
namespace {
class ExitLoopOnRelease : public View {
public:
ExitLoopOnRelease() {}
class ExitLoopOnRelease : public View {
public:
ExitLoopOnRelease() {}
-
virtual ~ExitLoopOnRelease()
{}
+
~ExitLoopOnRelease() override
{}
private:
// Overridden from View:
private:
// Overridden from View:
- v
irtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE
{
+ v
oid OnMouseReleased(const ui::MouseEvent& event) override
{
GetWidget()->Close();
base::MessageLoop::current()->QuitNow();
}
GetWidget()->Close();
base::MessageLoop::current()->QuitNow();
}
@@
-59,11
+59,11
@@
class ExitLoopOnRelease : public View {
class GestureCaptureView : public View {
public:
GestureCaptureView() {}
class GestureCaptureView : public View {
public:
GestureCaptureView() {}
-
virtual ~GestureCaptureView()
{}
+
~GestureCaptureView() override
{}
private:
// Overridden from View:
private:
// Overridden from View:
- v
irtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE
{
+ v
oid OnGestureEvent(ui::GestureEvent* event) override
{
if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
GetWidget()->SetCapture(this);
event->StopPropagation();
if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
GetWidget()->SetCapture(this);
event->StopPropagation();
@@
-82,20
+82,16
@@
class MouseView : public View {
exited_(0),
pressed_(0) {
}
exited_(0),
pressed_(0) {
}
-
virtual ~MouseView()
{}
+
~MouseView() override
{}
-
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE
{
+
bool OnMousePressed(const ui::MouseEvent& event) override
{
pressed_++;
return true;
}
pressed_++;
return true;
}
- virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE {
- entered_++;
- }
+ void OnMouseEntered(const ui::MouseEvent& event) override { entered_++; }
- virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE {
- exited_++;
- }
+ void OnMouseExited(const ui::MouseEvent& event) override { exited_++; }
// Return the number of OnMouseEntered calls and reset the counter.
int EnteredCalls() {
// Return the number of OnMouseEntered calls and reset the counter.
int EnteredCalls() {
@@
-127,11
+123,11
@@
class MouseView : public View {
class NestedLoopCaptureView : public View {
public:
explicit NestedLoopCaptureView(Widget* widget) : widget_(widget) {}
class NestedLoopCaptureView : public View {
public:
explicit NestedLoopCaptureView(Widget* widget) : widget_(widget) {}
-
virtual ~NestedLoopCaptureView()
{}
+
~NestedLoopCaptureView() override
{}
private:
// Overridden from View:
private:
// Overridden from View:
-
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE
{
+
bool OnMousePressed(const ui::MouseEvent& event) override
{
// Start a nested loop.
widget_->Show();
widget_->SetCapture(widget_->GetContentsView());
// Start a nested loop.
widget_->Show();
widget_->SetCapture(widget_->GetContentsView());
@@
-155,9
+151,9
@@
class NestedLoopCaptureView : public View {
class WidgetTestInteractive : public WidgetTest {
public:
WidgetTestInteractive() {}
class WidgetTestInteractive : public WidgetTest {
public:
WidgetTestInteractive() {}
-
virtual ~WidgetTestInteractive()
{}
+
~WidgetTestInteractive() override
{}
- v
irtual void SetUp() OVERRIDE
{
+ v
oid SetUp() override
{
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
base::FilePath ui_test_pak_path;
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
base::FilePath ui_test_pak_path;
@@
-587,7
+583,7
@@
class WidgetActivationTest : public Widget {
virtual ~WidgetActivationTest() {}
virtual ~WidgetActivationTest() {}
- virtual void OnNativeWidgetActivationChanged(bool active)
OVERRIDE
{
+ virtual void OnNativeWidgetActivationChanged(bool active)
override
{
active_ = active;
}
active_ = active;
}
@@
-637,12
+633,10
@@
TEST_F(WidgetTestInteractive, WidgetNotActivatedOnFakeActivationMessages) {
class ModalDialogDelegate : public DialogDelegateView {
public:
explicit ModalDialogDelegate(ui::ModalType type) : type_(type) {}
class ModalDialogDelegate : public DialogDelegateView {
public:
explicit ModalDialogDelegate(ui::ModalType type) : type_(type) {}
-
virtual ~ModalDialogDelegate()
{}
+
~ModalDialogDelegate() override
{}
// WidgetDelegate overrides.
// WidgetDelegate overrides.
- virtual ui::ModalType GetModalType() const OVERRIDE {
- return type_;
- }
+ ui::ModalType GetModalType() const override { return type_; }
private:
ui::ModalType type_;
private:
ui::ModalType type_;
@@
-858,7
+852,7
@@
namespace {
class CaptureLostTrackingWidget : public Widget {
public:
CaptureLostTrackingWidget() : got_capture_lost_(false) {}
class CaptureLostTrackingWidget : public Widget {
public:
CaptureLostTrackingWidget() : got_capture_lost_(false) {}
-
virtual ~CaptureLostTrackingWidget()
{}
+
~CaptureLostTrackingWidget() override
{}
bool GetAndClearGotCaptureLost() {
bool value = got_capture_lost_;
bool GetAndClearGotCaptureLost() {
bool value = got_capture_lost_;
@@
-867,7
+861,7
@@
class CaptureLostTrackingWidget : public Widget {
}
// Widget:
}
// Widget:
- v
irtual void OnMouseCaptureLost() OVERRIDE
{
+ v
oid OnMouseCaptureLost() override
{
got_capture_lost_ = true;
Widget::OnMouseCaptureLost();
}
got_capture_lost_ = true;
Widget::OnMouseCaptureLost();
}
@@
-885,10
+879,9
@@
class WidgetCaptureTest : public ViewsTestBase {
WidgetCaptureTest() {
}
WidgetCaptureTest() {
}
- virtual ~WidgetCaptureTest() {
- }
+ ~WidgetCaptureTest() override {}
- v
irtual void SetUp() OVERRIDE
{
+ v
oid SetUp() override
{
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
base::FilePath ui_test_pak_path;
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
base::FilePath ui_test_pak_path;
@@
-1044,11
+1037,10
@@
class CaptureOnActivationObserver : public WidgetObserver {
public:
CaptureOnActivationObserver() {
}
public:
CaptureOnActivationObserver() {
}
- virtual ~CaptureOnActivationObserver() {
- }
+ ~CaptureOnActivationObserver() override {}
// WidgetObserver:
// WidgetObserver:
- v
irtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE
{
+ v
oid OnWidgetActivationChanged(Widget* widget, bool active) override
{
if (active)
widget->SetCapture(NULL);
}
if (active)
widget->SetCapture(NULL);
}
@@
-1101,7
+1093,7
@@
class MouseEventTrackingWidget : public Widget {
}
// Widget:
}
// Widget:
- virtual void OnMouseEvent(ui::MouseEvent* event)
OVERRIDE
{
+ virtual void OnMouseEvent(ui::MouseEvent* event)
override
{
got_mouse_event_ = true;
Widget::OnMouseEvent(event);
}
got_mouse_event_ = true;
Widget::OnMouseEvent(event);
}