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/browser/avatar_icon_controller.h" | 5 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_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 "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 9 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
10 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" | 10 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" |
11 #include "chrome/browser/managed_mode/managed_user_service.h" | 11 #include "chrome/browser/managed_mode/managed_user_service.h" |
12 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 12 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
13 #include "chrome/browser/prefs/pref_service_syncable.h" | 13 #include "chrome/browser/prefs/pref_service_syncable.h" |
14 #include "chrome/browser/search_engines/template_url_service_factory.h" | 14 #include "chrome/browser/search_engines/template_url_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/avatar_menu_bubble_controller.h" | |
20 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 19 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
21 #include "chrome/browser/ui/cocoa/info_bubble_window.h" | 20 #include "chrome/browser/ui/cocoa/info_bubble_window.h" |
| 21 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h" |
22 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 22 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
24 #include "chrome/test/base/testing_profile.h" | 24 #include "chrome/test/base/testing_profile.h" |
25 | 25 |
26 class AvatarIconControllerTest : public CocoaProfileTest { | 26 class AvatarIconControllerTest : public CocoaProfileTest { |
27 public: | 27 public: |
28 virtual void SetUp() OVERRIDE { | 28 virtual void SetUp() OVERRIDE { |
29 CocoaProfileTest::SetUp(); | 29 CocoaProfileTest::SetUp(); |
30 ASSERT_TRUE(browser()); | 30 ASSERT_TRUE(browser()); |
31 | 31 |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop())); | 114 new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop())); |
115 // Build a new controller to check if it is initialized correctly for a | 115 // Build a new controller to check if it is initialized correctly for a |
116 // managed user profile. | 116 // managed user profile. |
117 base::scoped_nsobject<AvatarIconController> controller( | 117 base::scoped_nsobject<AvatarIconController> controller( |
118 [[AvatarIconController alloc] initWithBrowser:browser]); | 118 [[AvatarIconController alloc] initWithBrowser:browser]); |
119 | 119 |
120 EXPECT_TRUE([controller labelButtonView]); | 120 EXPECT_TRUE([controller labelButtonView]); |
121 | 121 |
122 browser->window()->Close(); | 122 browser->window()->Close(); |
123 } | 123 } |
OLD | NEW |