| 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 "chrome/browser/profiles/profile_manager.h" |
| 10 #include "chrome/browser/profiles/profiles_state.h" | 11 #include "chrome/browser/profiles/profiles_state.h" |
| 11 #include "chrome/browser/profiles/profile_manager.h" | |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
| 14 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 14 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" |
| 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 16 #include "chrome/browser/ui/cocoa/info_bubble_window.h" | 16 #include "chrome/browser/ui/cocoa/info_bubble_window.h" |
| 17 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" | 17 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" |
| 18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 19 #include "chrome/grit/generated_resources.h" |
| 19 #include "components/signin/core/common/profile_management_switches.h" | 20 #include "components/signin/core/common/profile_management_switches.h" |
| 20 #include "grit/generated_resources.h" | |
| 21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 22 | 22 |
| 23 class AvatarButtonControllerTest : public CocoaProfileTest { | 23 class AvatarButtonControllerTest : public CocoaProfileTest { |
| 24 public: | 24 public: |
| 25 virtual void SetUp() OVERRIDE { | 25 virtual void SetUp() OVERRIDE { |
| 26 switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess()); | 26 switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess()); |
| 27 DCHECK(profiles::IsMultipleProfilesEnabled()); | 27 DCHECK(profiles::IsMultipleProfilesEnabled()); |
| 28 | 28 |
| 29 CocoaProfileTest::SetUp(); | 29 CocoaProfileTest::SetUp(); |
| 30 ASSERT_TRUE(browser()); | 30 ASSERT_TRUE(browser()); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 [button() performClick:button()]; | 66 [button() performClick:button()]; |
| 67 EXPECT_EQ(menu, [controller() menuController]); | 67 EXPECT_EQ(menu, [controller() menuController]); |
| 68 | 68 |
| 69 // Do not animate out because that is hard to test around. | 69 // Do not animate out because that is hard to test around. |
| 70 static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations = | 70 static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations = |
| 71 info_bubble::kAnimateNone; | 71 info_bubble::kAnimateNone; |
| 72 [menu close]; | 72 [menu close]; |
| 73 EXPECT_FALSE([controller() menuController]); | 73 EXPECT_FALSE([controller() menuController]); |
| 74 } | 74 } |
| OLD | NEW |