summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/ash.gyp7
-rw-r--r--ash/shell/window_type_launcher.cc4
-rw-r--r--ash/test/child_modal_window.cc (renamed from ui/views/test/child_modal_window.cc)32
-rw-r--r--ash/test/child_modal_window.h (renamed from ui/views/test/child_modal_window.h)37
-rw-r--r--ash/wm/window_modality_controller_unittest.cc10
-rw-r--r--ui/message_center/views/notification_view.cc3
-rw-r--r--ui/message_center/views/padded_button.h2
-rw-r--r--ui/views/test/test_views_delegate_aura.cc (renamed from ui/views/test/test_views_delegate.cc)2
-rw-r--r--ui/views/test/test_views_delegate_mac.mm36
-rw-r--r--ui/views/view_unittest.cc4
-rw-r--r--ui/views/views.gyp21
11 files changed, 110 insertions, 48 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 7ed1c8c..1c166d5 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -809,6 +809,8 @@
'test/ash_test_helper.h',
'test/ash_test_views_delegate.cc',
'test/ash_test_views_delegate.h',
+ 'test/child_modal_window.cc',
+ 'test/child_modal_window.h',
'test/cursor_manager_test_api.cc',
'test/cursor_manager_test_api.h',
'test/display_manager_test_api.cc',
@@ -939,7 +941,7 @@
'drag_drop/drag_drop_tracker_unittest.cc',
'extended_desktop_unittest.cc',
'focus_cycler_unittest.cc',
- 'frame/caption_buttons/frame_caption_button_container_view_unittest.cc',
+ 'frame/caption_buttons/frame_caption_button_container_view_unittest.cc',
'frame/caption_buttons/frame_size_button_unittest.cc',
'frame/custom_frame_view_ash_unittest.cc',
'frame/default_header_painter_unittest.cc',
@@ -1131,10 +1133,11 @@
'ash_resources',
'ash_strings.gyp:ash_strings',
'ash_with_content',
+ 'ash_test_support',
],
'sources': [
'../content/app/startup_helper_win.cc',
- '../ui/views/test/test_views_delegate.cc',
+ '../ui/views/test/test_views_delegate_aura.cc',
'shell/app_list.cc',
'shell/bubble.cc',
'shell/content_client/shell_browser_main_parts.cc',
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index a84b4cb..dcf113d 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -16,6 +16,7 @@
#include "ash/shell_window_ids.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/web_notification/web_notification_tray.h"
+#include "ash/test/child_modal_window.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -31,7 +32,6 @@
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/examples/examples_window_with_content.h"
#include "ui/views/layout/grid_layout.h"
-#include "ui/views/test/child_modal_window.h"
#include "ui/views/widget/widget.h"
#include "ui/wm/core/shadow_types.h"
@@ -323,7 +323,7 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender,
ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(),
ui::MODAL_TYPE_WINDOW);
} else if (sender == child_modal_button_) {
- views::test::CreateChildModalParent(
+ ash::test::CreateChildModalParent(
GetWidget()->GetNativeView()->GetRootWindow());
} else if (sender == transient_button_) {
NonModalTransient::OpenNonModalTransient(GetWidget()->GetNativeView());
diff --git a/ui/views/test/child_modal_window.cc b/ash/test/child_modal_window.cc
index fc19ddf..793b1bf 100644
--- a/ui/views/test/child_modal_window.cc
+++ b/ash/test/child_modal_window.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/views/test/child_modal_window.h"
+#include "ash/test/child_modal_window.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/aura/window.h"
@@ -15,7 +15,9 @@
#include "ui/views/widget/widget_delegate.h"
#include "ui/wm/core/window_modality_controller.h"
-namespace views {
+using views::Widget;
+
+namespace ash {
namespace test {
namespace {
@@ -53,7 +55,7 @@ void CreateChildModalParent(gfx::NativeView context) {
}
-class ChildModalWindow : public WidgetDelegateView {
+class ChildModalWindow : public views::WidgetDelegateView {
public:
ChildModalWindow();
virtual ~ChildModalWindow();
@@ -73,7 +75,7 @@ class ChildModalWindow : public WidgetDelegateView {
};
ChildModalWindow::ChildModalWindow() {
- Textfield* textfield = new Textfield;
+ views::Textfield* textfield = new views::Textfield;
AddChildView(textfield);
textfield->SetBounds(
kChildTextfieldLeft, kChildTextfieldTop,
@@ -91,7 +93,7 @@ gfx::Size ChildModalWindow::GetPreferredSize() const {
return gfx::Size(kChildWindowWidth, kChildWindowHeight);
}
-View* ChildModalWindow::GetContentsView() {
+views::View* ChildModalWindow::GetContentsView() {
return this;
}
@@ -108,11 +110,11 @@ ui::ModalType ChildModalWindow::GetModalType() const {
}
ChildModalParent::ChildModalParent(gfx::NativeView context)
- : button_(new LabelButton(this,
- base::ASCIIToUTF16(
- "Show/Hide Child Modal Window"))),
- textfield_(new Textfield),
- host_(new NativeViewHost),
+ : button_(new views::LabelButton(this,
+ base::ASCIIToUTF16(
+ "Show/Hide Child Modal Window"))),
+ textfield_(new views::Textfield),
+ host_(new views::NativeViewHost),
modal_parent_(NULL),
child_(NULL) {
Widget* widget = new Widget;
@@ -120,7 +122,7 @@ ChildModalParent::ChildModalParent(gfx::NativeView context)
params.context = context;
widget->Init(params);
widget->GetRootView()->set_background(
- Background::CreateSolidBackground(kModalParentColor));
+ views::Background::CreateSolidBackground(kModalParentColor));
modal_parent_ = widget->GetNativeView();
widget->GetNativeView()->SetName("ModalParent");
AddChildView(button_);
@@ -156,7 +158,7 @@ Widget* ChildModalParent::CreateChild() {
return child;
}
-View* ChildModalParent::GetContentsView() {
+views::View* ChildModalParent::GetContentsView() {
return this;
}
@@ -195,7 +197,7 @@ void ChildModalParent::ViewHierarchyChanged(
}
}
-void ChildModalParent::ButtonPressed(Button* sender,
+void ChildModalParent::ButtonPressed(views::Button* sender,
const ui::Event& event) {
if (sender == button_) {
if (!child_)
@@ -215,4 +217,4 @@ void ChildModalParent::OnWidgetDestroying(Widget* widget) {
}
} // namespace test
-} // namespace views
+} // namespace ash
diff --git a/ui/views/test/child_modal_window.h b/ash/test/child_modal_window.h
index 1e86eae..ed8553a 100644
--- a/ui/views/test/child_modal_window.h
+++ b/ash/test/child_modal_window.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_
-#define UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_
+#ifndef ASH_TEST_CHILD_MODAL_WINDOW_H_
+#define ASH_TEST_CHILD_MODAL_WINDOW_H_
#include "ui/views/controls/button/button.h"
#include "ui/views/widget/widget_delegate.h"
@@ -15,13 +15,16 @@ class NativeViewHost;
class Textfield;
class View;
class Widget;
+}
+
+namespace ash {
namespace test {
void CreateChildModalParent(gfx::NativeView context);
-class ChildModalParent : public WidgetDelegateView,
- public ButtonListener,
- public WidgetObserver {
+class ChildModalParent : public views::WidgetDelegateView,
+ public views::ButtonListener,
+ public views::WidgetObserver {
public:
ChildModalParent(gfx::NativeView context);
virtual ~ChildModalParent();
@@ -31,45 +34,47 @@ class ChildModalParent : public WidgetDelegateView,
gfx::NativeWindow GetChild() const;
private:
- Widget* CreateChild();
+ views::Widget* CreateChild();
- // Overridden from WidgetDelegate:
+ // Overridden from views::WidgetDelegate:
virtual View* GetContentsView() OVERRIDE;
virtual base::string16 GetWindowTitle() const OVERRIDE;
virtual bool CanResize() const OVERRIDE;
virtual void DeleteDelegate() OVERRIDE;
+
+ // Overridden from views::View:
virtual void Layout() OVERRIDE;
virtual void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) OVERRIDE;
// Overridden from ButtonListener:
- virtual void ButtonPressed(Button* sender,
+ virtual void ButtonPressed(views::Button* sender,
const ui::Event& event) OVERRIDE;
// Overridden from WidgetObserver:
- virtual void OnWidgetDestroying(Widget* widget) OVERRIDE;
+ virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
// The button to toggle showing and hiding the child window. The child window
// does not block input to this button.
- LabelButton* button_;
+ views::LabelButton* button_;
// The text field to indicate the keyboard focus.
- Textfield* textfield_;
+ views::Textfield* textfield_;
// The host for the modal parent.
- NativeViewHost* host_;
+ views::NativeViewHost* host_;
// The modal parent of the child window. The child window blocks input to this
// view.
gfx::NativeWindow modal_parent_;
// The child window.
- Widget* child_;
+ views::Widget* child_;
DISALLOW_COPY_AND_ASSIGN(ChildModalParent);
};
} // namespace test
-} // namespace views
+} // namespace ash
-#endif // UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_
+#endif // ASH_TEST_CHILD_MODAL_WINDOW_H_
diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc
index ce70432..1519d27 100644
--- a/ash/wm/window_modality_controller_unittest.cc
+++ b/ash/wm/window_modality_controller_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
+#include "ash/test/child_modal_window.h"
#include "ash/wm/window_util.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/test/event_generator.h"
@@ -15,7 +16,6 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/ui_base_types.h"
#include "ui/views/test/capture_tracking_view.h"
-#include "ui/views/test/child_modal_window.h"
#include "ui/views/widget/widget.h"
#include "ui/wm/core/window_util.h"
@@ -392,8 +392,8 @@ TEST_F(WindowModalityControllerTest, TouchEvent) {
// |child| window.
// - Focus should follow the active window.
TEST_F(WindowModalityControllerTest, ChildModal) {
- views::test::ChildModalParent* delegate =
- new views::test::ChildModalParent(CurrentContext());
+ test::ChildModalParent* delegate =
+ new test::ChildModalParent(CurrentContext());
views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
delegate, CurrentContext(), gfx::Rect(0, 0, 400, 400));
widget->Show();
@@ -452,8 +452,8 @@ TEST_F(WindowModalityControllerTest, ChildModal) {
// Same as |ChildModal| test, but using |EventGenerator| rather than bypassing
// it by calling |ActivateWindow|.
TEST_F(WindowModalityControllerTest, ChildModalEventGenerator) {
- views::test::ChildModalParent* delegate =
- new views::test::ChildModalParent(CurrentContext());
+ test::ChildModalParent* delegate =
+ new test::ChildModalParent(CurrentContext());
views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
delegate, CurrentContext(), gfx::Rect(0, 0, 400, 400));
widget->Show();
diff --git a/ui/message_center/views/notification_view.cc b/ui/message_center/views/notification_view.cc
index 707c42b..3dc31bf 100644
--- a/ui/message_center/views/notification_view.cc
+++ b/ui/message_center/views/notification_view.cc
@@ -37,6 +37,7 @@
#include "ui/views/controls/progress_bar.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/fill_layout.h"
+#include "ui/views/native_cursor.h"
#include "ui/views/painter.h"
#include "ui/views/widget/widget.h"
@@ -466,7 +467,7 @@ gfx::NativeCursor NotificationView::GetCursor(const ui::MouseEvent& event) {
if (!clickable_ || !controller_->HasClickedListener(notification_id()))
return views::View::GetCursor(event);
- return ui::kCursorHand;
+ return views::GetNativeHandCursor();
}
void NotificationView::UpdateWithNotification(
diff --git a/ui/message_center/views/padded_button.h b/ui/message_center/views/padded_button.h
index 57d2fe7..c420621 100644
--- a/ui/message_center/views/padded_button.h
+++ b/ui/message_center/views/padded_button.h
@@ -49,4 +49,4 @@ class PaddedButton : public views::ImageButton {
} // namespace message_center
-#endif // UI_MESSAGE_CENTER_VIEWS_PADDED_BUTTON_H_ \ No newline at end of file
+#endif // UI_MESSAGE_CENTER_VIEWS_PADDED_BUTTON_H_
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate_aura.cc
index 0d437ea..62efccf 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate_aura.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/ui/views/test/test_views_delegate_mac.mm b/ui/views/test/test_views_delegate_mac.mm
new file mode 100644
index 0000000..79b620b
--- /dev/null
+++ b/ui/views/test/test_views_delegate_mac.mm
@@ -0,0 +1,36 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/views/test/test_views_delegate.h"
+
+#include "ui/views/widget/native_widget_mac.h"
+
+namespace views {
+
+TestViewsDelegate::TestViewsDelegate()
+ : use_desktop_native_widgets_(false),
+ use_transparent_windows_(false) {
+ DCHECK(!ViewsDelegate::views_delegate);
+ ViewsDelegate::views_delegate = this;
+}
+
+TestViewsDelegate::~TestViewsDelegate() {
+ if (ViewsDelegate::views_delegate == this)
+ ViewsDelegate::views_delegate = NULL;
+}
+
+void TestViewsDelegate::OnBeforeWidgetInit(
+ Widget::InitParams* params,
+ internal::NativeWidgetDelegate* delegate) {
+ if (params->opacity == Widget::InitParams::INFER_OPACITY) {
+ params->opacity = use_transparent_windows_ ?
+ Widget::InitParams::TRANSLUCENT_WINDOW :
+ Widget::InitParams::OPAQUE_WINDOW;
+ }
+ // TODO(tapted): This should return a *Desktop*NativeWidgetMac.
+ if (!params->native_widget && use_desktop_native_widgets_)
+ params->native_widget = new NativeWidgetMac(delegate);
+}
+
+} // namespace views
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index bf8395f..dcc7dbf 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -1487,7 +1487,7 @@ bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
// TODO: these tests were initially commented out when getting aura to
// run. Figure out if still valuable and either nuke or fix.
-#if defined(false)
+#if 0
TEST_F(ViewTest, ActivateAccelerator) {
// Register a keyboard accelerator before the view is added to a window.
ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
@@ -1692,7 +1692,7 @@ TEST_F(ViewTest, DISABLED_RerouteMouseWheelTest) {
window1->CloseNow();
window2->CloseNow();
}
-#endif // false
+#endif // 0
////////////////////////////////////////////////////////////////////////////////
// Native view hierachy
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index feeef4c..3250996 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -599,16 +599,15 @@
'corewm/tooltip_controller_test_helper.h',
'test/capture_tracking_view.cc',
'test/capture_tracking_view.h',
- 'test/child_modal_window.cc',
- 'test/child_modal_window.h',
'test/desktop_test_views_delegate.cc',
'test/desktop_test_views_delegate.h',
'test/menu_runner_test_api.cc',
'test/menu_runner_test_api.h',
'test/test_views.cc',
'test/test_views.h',
- 'test/test_views_delegate.cc',
'test/test_views_delegate.h',
+ 'test/test_views_delegate_aura.cc',
+ 'test/test_views_delegate_mac.mm',
'test/test_widget_observer.cc',
'test/test_widget_observer.h',
'test/ui_controls_factory_desktop_aurax11.cc',
@@ -654,6 +653,7 @@
'../compositor/compositor.gyp:compositor',
'../compositor/compositor.gyp:compositor_test_support',
'../events/events.gyp:events',
+ '../events/events.gyp:events_base',
'../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_geometry',
'../resources/ui_resources.gyp:ui_resources',
@@ -796,6 +796,21 @@
'../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
],
}],
+ ['OS=="mac"', {
+ # views_unittests not yet compiling on Mac. http://crbug.com/378134
+ 'sources!': [
+ 'bubble/bubble_window_targeter_unittest.cc',
+ 'controls/button/custom_button_unittest.cc',
+ 'controls/button/menu_button_unittest.cc',
+ 'controls/native/native_view_host_unittest.cc',
+ 'controls/menu/menu_controller_unittest.cc',
+ 'ime/input_method_bridge_unittest.cc',
+ 'focus/focus_manager_unittest.cc',
+ 'widget/window_reorderer_unittest.cc',
+ 'widget/widget_unittest.cc',
+ 'view_unittest.cc',
+ ]
+ }],
],
}, # target_name: views_unittests
],
generated by cgit v1.1 at 2025-03-12 07:29:50 +0000