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

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/profiles/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"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 item = [menu itemAtIndex:1]; 274 item = [menu itemAtIndex:1];
275 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]); 275 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]);
276 EXPECT_TRUE([controller() validateMenuItem:item]); 276 EXPECT_TRUE([controller() validateMenuItem:item]);
277 277
278 item = [menu itemAtIndex:5]; 278 item = [menu itemAtIndex:5];
279 ASSERT_EQ(@selector(newProfile:), [item action]); 279 ASSERT_EQ(@selector(newProfile:), [item action]);
280 EXPECT_TRUE([controller() validateMenuItem:item]); 280 EXPECT_TRUE([controller() validateMenuItem:item]);
281 281
282 // Open a new browser for the supervised user and switch to it. 282 // Open a new browser for the supervised user and switch to it.
283 Browser::CreateParams supervised_profile_params( 283 Browser::CreateParams supervised_profile_params(supervised_profile,
284 supervised_profile, chrome::HOST_DESKTOP_TYPE_NATIVE); 284 ui::HOST_DESKTOP_TYPE_NATIVE);
285 scoped_ptr<Browser> supervised_browser( 285 scoped_ptr<Browser> supervised_browser(
286 chrome::CreateBrowserWithTestWindowForParams(&supervised_profile_params)); 286 chrome::CreateBrowserWithTestWindowForParams(&supervised_profile_params));
287 BrowserList::SetLastActive(supervised_browser.get()); 287 BrowserList::SetLastActive(supervised_browser.get());
288 288
289 item = [menu itemAtIndex:0]; 289 item = [menu itemAtIndex:0];
290 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]); 290 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]);
291 EXPECT_FALSE([controller() validateMenuItem:item]); 291 EXPECT_FALSE([controller() validateMenuItem:item]);
292 292
293 item = [menu itemAtIndex:1]; 293 item = [menu itemAtIndex:1];
294 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]); 294 ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]);
295 EXPECT_TRUE([controller() validateMenuItem:item]); 295 EXPECT_TRUE([controller() validateMenuItem:item]);
296 296
297 item = [menu itemAtIndex:5]; 297 item = [menu itemAtIndex:5];
298 ASSERT_EQ(@selector(newProfile:), [item action]); 298 ASSERT_EQ(@selector(newProfile:), [item action]);
299 EXPECT_FALSE([controller() validateMenuItem:item]); 299 EXPECT_FALSE([controller() validateMenuItem:item]);
300 } 300 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698