| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/profile_menu_controller.h" | 5 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h" |
| 6 | 6 |
| 7 #include "base/mac/scoped_nsobject.h" | 7 #include "base/mac/scoped_nsobject.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/threading/thread_restrictions.h" | 9 #include "base/threading/thread_restrictions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/prefs/pref_service_syncable.h" | 11 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 15 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 15 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 EXPECT_FALSE([controller() validateMenuItem:item]); | 281 EXPECT_FALSE([controller() validateMenuItem:item]); |
| 282 | 282 |
| 283 item = [menu itemAtIndex:1]; | 283 item = [menu itemAtIndex:1]; |
| 284 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]); | 284 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]); |
| 285 EXPECT_TRUE([controller() validateMenuItem:item]); | 285 EXPECT_TRUE([controller() validateMenuItem:item]); |
| 286 | 286 |
| 287 item = [menu itemAtIndex:5]; | 287 item = [menu itemAtIndex:5]; |
| 288 ASSERT_EQ(@selector(newProfile:), [item action]); | 288 ASSERT_EQ(@selector(newProfile:), [item action]); |
| 289 EXPECT_FALSE([controller() validateMenuItem:item]); | 289 EXPECT_FALSE([controller() validateMenuItem:item]); |
| 290 } | 290 } |
| OLD | NEW |