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

Unified Diff: chrome/test/base/interactive_test_utils_cocoa.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
« no previous file with comments | « chrome/test/base/interactive_test_utils.h ('k') | chrome/test/base/interactive_test_utils_common_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/interactive_test_utils_cocoa.mm
diff --git a/chrome/test/base/interactive_test_utils_mac.mm b/chrome/test/base/interactive_test_utils_cocoa.mm
similarity index 66%
copy from chrome/test/base/interactive_test_utils_mac.mm
copy to chrome/test/base/interactive_test_utils_cocoa.mm
index c1c3b10f8681be79265ffc4cd35998adea9efd61..228c0a249298b52778e33d2bf8929fc25c8a8d47 100644
--- a/chrome/test/base/interactive_test_utils_mac.mm
+++ b/chrome/test/base/interactive_test_utils_cocoa.mm
@@ -1,10 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 "chrome/test/base/interactive_test_utils.h"
-#include <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#include "base/bind.h"
@@ -14,8 +13,6 @@
#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 {
@@ -95,35 +92,4 @@ void FocusView(const Browser* browser, ViewID vid) {
[window makeFirstResponder:view];
}
-void HideNativeWindow(gfx::NativeWindow window) {
- [window orderOut:nil];
-}
-
-bool ShowAndFocusNativeWindow(gfx::NativeWindow window) {
- // Make sure an unbundled program can get the input focus.
- ProcessSerialNumber psn = { 0, kCurrentProcess };
- TransformProcessType(&psn,kProcessTransformToForegroundApplication);
- SetFrontProcess(&psn);
-
- base::scoped_nsobject<WindowedNSNotificationObserver> async_waiter;
- if (![window isKeyWindow]) {
- // Only wait when expecting a change to actually occur.
- async_waiter.reset([[WindowedNSNotificationObserver alloc]
- initForNotification:NSWindowDidBecomeKeyNotification
- object:window]);
- }
- [window makeKeyAndOrderFront:nil];
-
- // Wait until |window| becomes key window, then make sure the shortcuts for
- // "Close Window" and "Close Tab" are updated.
- // This is because normal AppKit menu updating does not get invoked when
- // events are sent via ui_test_utils::SendKeyPressSync.
- BOOL notification_observed = [async_waiter wait];
- base::RunLoop().RunUntilIdle(); // There may be other events queued. Flush.
- NSMenu* file_menu = [[[NSApp mainMenu] itemWithTag:IDC_FILE_MENU] submenu];
- [[file_menu delegate] menuNeedsUpdate:file_menu];
-
- return !async_waiter || notification_observed;
-}
-
} // namespace ui_test_utils
« no previous file with comments | « chrome/test/base/interactive_test_utils.h ('k') | chrome/test/base/interactive_test_utils_common_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698