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

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

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/exclusive_access_bubble_window_controller.h" 5 #import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h"
6 6
7 #include "base/mac/mac_util.h"
8 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/cocoa/browser_window_controller.h" 10 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 11 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
15 #include "content/public/browser/notification_service.h" 14 #include "content/public/browser/notification_service.h"
16 #include "content/public/browser/site_instance.h" 15 #include "content/public/browser/site_instance.h"
17 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ui::PlatformAcceleratorCocoa cmd_F(@"F", NSCommandKeyMask); 122 ui::PlatformAcceleratorCocoa cmd_F(@"F", NSCommandKeyMask);
124 ui::PlatformAcceleratorCocoa cmd_shift_f(@"f", 123 ui::PlatformAcceleratorCocoa cmd_shift_f(@"f",
125 NSCommandKeyMask | NSShiftKeyMask); 124 NSCommandKeyMask | NSShiftKeyMask);
126 NSString* cmd_F_text = [ExclusiveAccessBubbleWindowController 125 NSString* cmd_F_text = [ExclusiveAccessBubbleWindowController
127 keyCombinationForAccelerator:cmd_F]; 126 keyCombinationForAccelerator:cmd_F];
128 NSString* cmd_shift_f_text = [ExclusiveAccessBubbleWindowController 127 NSString* cmd_shift_f_text = [ExclusiveAccessBubbleWindowController
129 keyCombinationForAccelerator:cmd_shift_f]; 128 keyCombinationForAccelerator:cmd_shift_f];
130 EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text); 129 EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text);
131 EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text); 130 EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text);
132 } 131 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698