Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: chrome/test/base/interactive_test_utils_mac.mm

Issue 1678163002: mac_views_browser: fixed interactive_ui_tests compilation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unneeded header, enable ActivateOverflowedToolbarActionWithKeyboard test compilation on Mac Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/base/interactive_test_utils_mac.mm
diff --git a/chrome/test/base/interactive_test_utils_mac.mm b/chrome/test/base/interactive_test_utils_mac.mm
index c1c3b10f8681be79265ffc4cd35998adea9efd61..0d00f3a6614e3aacd4c9141ed971ae02590ea1d1 100644
--- a/chrome/test/base/interactive_test_utils_mac.mm
+++ b/chrome/test/base/interactive_test_utils_mac.mm
@@ -7,94 +7,12 @@
#include <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
-#include "base/bind.h"
-#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/cocoa/view_id_util.h"
-#include "ui/base/test/ui_controls.h"
#import "ui/base/test/windowed_nsnotification_observer.h"
namespace ui_test_utils {
-namespace {
-
-void MoveMouseToNSViewCenterAndPress(
- NSView* view,
- ui_controls::MouseButton button,
- int state,
- const base::Closure& task) {
- NSWindow* window = [view window];
- NSScreen* screen = [window screen];
- DCHECK(screen);
-
- // Converts the center position of the view into the coordinates accepted
- // by SendMouseMoveNotifyWhenDone() method.
- NSRect bounds = [view bounds];
- NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds));
- center = [view convertPoint:center toView:nil];
- center = [window convertBaseToScreen:center];
- center = NSMakePoint(center.x, [screen frame].size.height - center.y);
-
- ui_controls::SendMouseMoveNotifyWhenDone(
- center.x, center.y,
- base::Bind(&internal::ClickTask, button, state, task));
-}
-
-} // namespace
-
-bool IsViewFocused(const Browser* browser, ViewID vid) {
- NSWindow* window = browser->window()->GetNativeWindow();
- DCHECK(window);
- NSView* view = view_id_util::GetView(window, vid);
- if (!view)
- return false;
-
- NSResponder* firstResponder = [window firstResponder];
- if (firstResponder == static_cast<NSResponder*>(view))
- return true;
-
- // Handle special case for VIEW_ID_TAB_CONTAINER. The tab container NSView
- // always transfers first responder status to its subview, so test whether
- // |firstResponder| is a descendant.
- if (vid == VIEW_ID_TAB_CONTAINER &&
- [firstResponder isKindOfClass:[NSView class]])
- return [static_cast<NSView*>(firstResponder) isDescendantOf:view];
-
- // Handle the special case of focusing a TextField.
- if ([firstResponder isKindOfClass:[NSTextView class]]) {
- NSView* delegate = static_cast<NSView*>([(NSTextView*)firstResponder
- delegate]);
- if (delegate == view)
- return true;
- }
-
- return false;
-}
-
-void ClickOnView(const Browser* browser, ViewID vid) {
- NSWindow* window = browser->window()->GetNativeWindow();
- DCHECK(window);
- NSView* view = view_id_util::GetView(window, vid);
- DCHECK(view);
- MoveMouseToNSViewCenterAndPress(
- view,
- ui_controls::LEFT,
- ui_controls::DOWN | ui_controls::UP,
- base::MessageLoop::QuitWhenIdleClosure());
- content::RunMessageLoop();
-}
-
-void FocusView(const Browser* browser, ViewID vid) {
- NSWindow* window = browser->window()->GetNativeWindow();
- DCHECK(window);
- NSView* view = view_id_util::GetView(window, vid);
- DCHECK(view);
- [window makeFirstResponder:view];
- }
-
void HideNativeWindow(gfx::NativeWindow window) {
[window orderOut:nil];
}
« no previous file with comments | « chrome/test/base/interactive_test_utils_common_views.cc ('k') | chrome/test/base/interactive_test_utils_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698