| 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_button_controller.h" | 5 #import "chrome/browser/ui/cocoa/profiles/avatar_button_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/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" | 
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" | 
| 11 #include "chrome/browser/profiles/profile_manager.h" | 11 #include "chrome/browser/profiles/profile_manager.h" | 
| 12 #include "chrome/browser/profiles/profiles_state.h" | 12 #include "chrome/browser/profiles/profiles_state.h" | 
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" | 
| 14 #include "chrome/browser/ui/browser_window.h" | 14 #include "chrome/browser/ui/browser_window.h" | 
| 15 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 15 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 
| 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |  | 
| 17 #include "chrome/browser/ui/cocoa/info_bubble_window.h" | 16 #include "chrome/browser/ui/cocoa/info_bubble_window.h" | 
| 18 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" | 17 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" | 
|  | 18 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" | 
| 20 #include "chrome/grit/generated_resources.h" | 20 #include "chrome/grit/generated_resources.h" | 
| 21 #include "chrome/grit/theme_resources.h" | 21 #include "chrome/grit/theme_resources.h" | 
| 22 #include "components/signin/core/common/profile_management_switches.h" | 22 #include "components/signin/core/common/profile_management_switches.h" | 
| 23 #import "testing/gtest_mac.h" | 23 #import "testing/gtest_mac.h" | 
| 24 #include "ui/base/material_design/material_design_controller.h" | 24 #include "ui/base/material_design/material_design_controller.h" | 
| 25 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" | 
| 26 | 26 | 
| 27 // Defined in the AvatarButtonController implementation. | 27 // Defined in the AvatarButtonController implementation. | 
| 28 @interface AvatarButtonController (ExposedForTesting) | 28 @interface AvatarButtonController (ExposedForTesting) | 
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 152   BaseBubbleController* menu = [controller() menuController]; | 152   BaseBubbleController* menu = [controller() menuController]; | 
| 153   EXPECT_TRUE(menu); | 153   EXPECT_TRUE(menu); | 
| 154   EXPECT_TRUE([menu isKindOfClass:[ProfileChooserController class]]); | 154   EXPECT_TRUE([menu isKindOfClass:[ProfileChooserController class]]); | 
| 155 | 155 | 
| 156   // Do not animate out because that is hard to test around. | 156   // Do not animate out because that is hard to test around. | 
| 157   static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations = | 157   static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations = | 
| 158       info_bubble::kAnimateNone; | 158       info_bubble::kAnimateNone; | 
| 159   [menu close]; | 159   [menu close]; | 
| 160   EXPECT_FALSE([controller() menuController]); | 160   EXPECT_FALSE([controller() menuController]); | 
| 161 } | 161 } | 
| OLD | NEW | 
|---|