chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm - Issue 1268293002: [MacViews] Fix AccessiblePaneViewTest.SetPaneFocusAndRestore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1268293002: [MacViews] Fix AccessiblePaneViewTest.SetPaneFocusAndRestore. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove roque delta. 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

« no previous file with comments | « chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm ('k') | chrome/browser/ui/test/scoped_fake_nswindow_main_status.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

index ce248ad2f3f6512777056127ca47b564883607ff..22f98a34ac4f057725ad53cf71ebb92c80cc7cdb 100644

--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

@@ -18,7 +18,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/extensions/app_launch_params.h"

#include "chrome/browser/ui/extensions/application_launch.h"

-#import "chrome/browser/ui/test/scoped_fake_nswindow_main_status.h"

#include "chrome/common/chrome_switches.h"

#include "content/public/browser/notification_service.h"

#include "content/public/test/test_utils.h"

@@ -28,6 +27,7 @@

#include "testing/gmock/include/gmock/gmock.h"

#import "testing/gtest_mac.h"

#import "ui/base/test/nswindow_fullscreen_notification_waiter.h"

+#import "ui/base/test/scoped_fake_nswindow_focus.h"

#import "ui/base/test/scoped_fake_nswindow_fullscreen.h"

#import "ui/base/test/windowed_nsnotification_observer.h"

#import "ui/gfx/mac/nswindow_frame_controls.h"

@@ -699,7 +699,8 @@ IN_PROC_BROWSER_TEST_P(NativeAppWindowCocoaBrowserTest, FrameColor) {

EXPECT_NEAR(expected_components[1], color_components[1], 0.01);

EXPECT_NEAR(expected_components[2], color_components[2], 0.01);

- ScopedFakeNSWindowMainStatus fake_main(ns_window);

+ ui::test::ScopedFakeNSWindowFocus fake_focus;

+ [ns_window makeMainWindow];

bitmap = ScreenshotNSWindow(ns_window);

// The window is now active so it should be red (#FF0000).