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 67% |
copy from chrome/test/base/interactive_test_utils_mac.mm |
copy to chrome/test/base/interactive_test_utils_cocoa.mm |
index c1c3b10f8681be79265ffc4cd35998adea9efd61..d33fe98fb83f62ce96535b00ebebaad477129de1 100644 |
--- a/chrome/test/base/interactive_test_utils_mac.mm |
+++ b/chrome/test/base/interactive_test_utils_cocoa.mm |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright (c) 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. |
@@ -14,8 +14,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 +93,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 |