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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #import "base/mac/mac_util.h" 7 #import "base/mac/mac_util.h"
8 #include "base/mac/sdk_forward_declarations.h" 8 #include "base/mac/sdk_forward_declarations.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/ui/browser_list.h" 21 #include "chrome/browser/ui/browser_list.h"
22 #include "chrome/browser/ui/browser_window.h" 22 #include "chrome/browser/ui/browser_window.h"
23 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 23 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
24 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" 24 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
25 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 25 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
26 #import "chrome/browser/ui/cocoa/history_overlay_controller.h" 26 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
27 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" 27 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
28 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 28 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
29 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" 29 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
30 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 30 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
31 #import "chrome/browser/ui/cocoa/nsview_additions.h"
32 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" 31 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
33 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 32 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
34 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 33 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
35 #include "chrome/browser/ui/extensions/application_launch.h" 34 #include "chrome/browser/ui/extensions/application_launch.h"
35 #include "chrome/browser/ui/find_bar/find_bar.h"
36 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 36 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
37 #include "chrome/browser/ui/find_bar/find_bar.h"
38 #include "chrome/browser/ui/tabs/tab_strip_model.h" 37 #include "chrome/browser/ui/tabs/tab_strip_model.h"
39 #include "chrome/test/base/in_process_browser_test.h" 38 #include "chrome/test/base/in_process_browser_test.h"
40 #include "chrome/test/base/testing_profile.h" 39 #include "chrome/test/base/testing_profile.h"
41 #include "content/public/browser/web_contents.h" 40 #include "content/public/browser/web_contents.h"
42 #include "content/public/test/test_utils.h" 41 #include "content/public/test/test_utils.h"
43 #import "testing/gtest_mac.h" 42 #import "testing/gtest_mac.h"
43 #import "ui/base/cocoa/nsview_additions.h"
44 #include "ui/gfx/animation/slide_animation.h" 44 #include "ui/gfx/animation/slide_animation.h"
45 45
46 namespace { 46 namespace {
47 47
48 void CreateProfileCallback(const base::Closure& quit_closure, 48 void CreateProfileCallback(const base::Closure& quit_closure,
49 Profile* profile, 49 Profile* profile,
50 Profile::CreateStatus status) { 50 Profile::CreateStatus status) {
51 EXPECT_TRUE(profile); 51 EXPECT_TRUE(profile);
52 EXPECT_NE(Profile::CREATE_STATUS_LOCAL_FAIL, status); 52 EXPECT_NE(Profile::CREATE_STATUS_LOCAL_FAIL, status);
53 EXPECT_NE(Profile::CREATE_STATUS_REMOTE_FAIL, status); 53 EXPECT_NE(Profile::CREATE_STATUS_REMOTE_FAIL, status);
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 // Toggle overlay, then verify z order. 501 // Toggle overlay, then verify z order.
502 [controller() showOverlay]; 502 [controller() showOverlay];
503 [controller() removeOverlay]; 503 [controller() removeOverlay];
504 VerifyTrafficLightZOrder(); 504 VerifyTrafficLightZOrder();
505 505
506 // Toggle immersive fullscreen, then verify z order. 506 // Toggle immersive fullscreen, then verify z order.
507 [controller() enterImmersiveFullscreen]; 507 [controller() enterImmersiveFullscreen];
508 [controller() exitImmersiveFullscreen]; 508 [controller() exitImmersiveFullscreen];
509 VerifyTrafficLightZOrder(); 509 VerifyTrafficLightZOrder();
510 } 510 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698