| OLD | NEW | 
|---|
| 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/avatar_icon_controller.h" | 5 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" | 
| 6 | 6 | 
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" | 
| 8 #include "base/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" | 
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" | 
| 10 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 10 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 
| 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 
| 12 #include "chrome/browser/search_engines/template_url_service_factory.h" | 12 #include "chrome/browser/search_engines/template_url_service_factory.h" | 
| 13 #include "chrome/browser/supervised_user/supervised_user_service.h" | 13 #include "chrome/browser/supervised_user/supervised_user_service.h" | 
| 14 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 14 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" | 
| 16 #include "chrome/browser/ui/browser_commands.h" | 16 #include "chrome/browser/ui/browser_commands.h" | 
| 17 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" | 
| 18 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 18 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 
| 19 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 19 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 
| 20 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 20 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 
| 21 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |  | 
| 22 #include "chrome/browser/ui/cocoa/info_bubble_window.h" | 21 #include "chrome/browser/ui/cocoa/info_bubble_window.h" | 
| 23 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" | 22 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" | 
|  | 23 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 
| 25 #include "chrome/test/base/testing_profile.h" | 25 #include "chrome/test/base/testing_profile.h" | 
| 26 #include "components/bookmarks/test/bookmark_test_helpers.h" | 26 #include "components/bookmarks/test/bookmark_test_helpers.h" | 
| 27 #include "components/signin/core/common/profile_management_switches.h" | 27 #include "components/signin/core/common/profile_management_switches.h" | 
| 28 #include "components/sync_preferences/pref_service_syncable.h" | 28 #include "components/sync_preferences/pref_service_syncable.h" | 
| 29 | 29 | 
| 30 class AvatarIconControllerTest : public CocoaProfileTest { | 30 class AvatarIconControllerTest : public CocoaProfileTest { | 
| 31  public: | 31  public: | 
| 32   AvatarIconControllerTest() {} | 32   AvatarIconControllerTest() {} | 
| 33 | 33 | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 60   EXPECT_TRUE([icon_controller isKindOfClass:[AvatarIconController class]]); | 60   EXPECT_TRUE([icon_controller isKindOfClass:[AvatarIconController class]]); | 
| 61 | 61 | 
| 62   browser->window()->Close(); | 62   browser->window()->Close(); | 
| 63 } | 63 } | 
| 64 | 64 | 
| 65 TEST_F(AvatarIconControllerTest, ShowingAvatarButtonInRegularSession) { | 65 TEST_F(AvatarIconControllerTest, ShowingAvatarButtonInRegularSession) { | 
| 66   // In a regular session, we should be using the AvatarButtonController to show | 66   // In a regular session, we should be using the AvatarButtonController to show | 
| 67   // the profile name. | 67   // the profile name. | 
| 68   EXPECT_TRUE([icon_controller() isKindOfClass:[AvatarButtonController class]]); | 68   EXPECT_TRUE([icon_controller() isKindOfClass:[AvatarButtonController class]]); | 
| 69 } | 69 } | 
| OLD | NEW | 
|---|