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

Unified Diff: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm

Issue 1268293002: [MacViews] Fix AccessiblePaneViewTest.SetPaneFocusAndRestore. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove dependent patch. Created 5 years, 4 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/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index 5959808c7cb46135f96f8949304c40a1d6633794..da38e5787963251be0aea7431c2ff964861bbc64 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -19,13 +19,13 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/test/scoped_fake_nswindow_main_status.h"
#include "chrome/common/chrome_switches.h"
#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/browser/app_window/native_app_window.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension.h"
#include "extensions/test/extension_test_message_listener.h"
+#import "ui/base/test/scoped_fake_nswindow_focus.h"
namespace {
@@ -186,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
extensions::AppWindow* app_1_app_window = FirstWindowForApp(app_1_);
{
- ScopedFakeNSWindowMainStatus app_1_is_main(
+ ui::test::ScopedFakeNSWindowMainStatus app_1_is_main(
app_1_app_window->GetNativeWindow());
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowDidBecomeMainNotification
@@ -253,7 +253,7 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowDidBecomeMainNotification
object:app_1_window];
- ScopedFakeNSWindowMainStatus app_1_is_main(app_1_window);
+ ui::test::ScopedFakeNSWindowMainStatus app_1_is_main(app_1_window);
CheckHasAppMenus(app_1_);
ExtensionService::UninstallExtensionHelper(

Powered by Google App Engine
This is Rietveld 408576698