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

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac 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/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/prefs/pref_service_syncable.h" 12 #include "chrome/browser/prefs/pref_service_syncable.h"
13 #include "chrome/browser/search_engines/template_url_service_factory.h" 13 #include "chrome/browser/search_engines/template_url_service_factory.h"
14 #include "chrome/browser/supervised_user/supervised_user_service.h" 14 #include "chrome/browser/supervised_user/supervised_user_service.h"
15 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 15 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_commands.h" 17 #include "chrome/browser/ui/browser_commands.h"
18 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
19 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" 19 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
20 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 20 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
21 #include "chrome/browser/ui/cocoa/info_bubble_window.h" 21 #include "chrome/browser/ui/cocoa/info_bubble_window.h"
22 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h" 22 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
23 #include "chrome/browser/ui/host_desktop.h"
23 #include "chrome/browser/ui/tabs/tab_strip_model.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model.h"
24 #include "chrome/test/base/testing_profile.h" 25 #include "chrome/test/base/testing_profile.h"
25 #include "components/bookmarks/test/bookmark_test_helpers.h" 26 #include "components/bookmarks/test/bookmark_test_helpers.h"
26 #include "components/signin/core/common/profile_management_switches.h" 27 #include "components/signin/core/common/profile_management_switches.h"
27 28
28 class AvatarIconControllerTest : public CocoaProfileTest { 29 class AvatarIconControllerTest : public CocoaProfileTest {
29 public: 30 public:
30 void SetUp() override { 31 void SetUp() override {
31 switches::DisableNewAvatarMenuForTesting( 32 switches::DisableNewAvatarMenuForTesting(
32 base::CommandLine::ForCurrentProcess()); 33 base::CommandLine::ForCurrentProcess());
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop())); 120 new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop()));
120 // Build a new controller to check if it is initialized correctly for a 121 // Build a new controller to check if it is initialized correctly for a
121 // supervised user profile. 122 // supervised user profile.
122 base::scoped_nsobject<AvatarIconController> controller( 123 base::scoped_nsobject<AvatarIconController> controller(
123 [[AvatarIconController alloc] initWithBrowser:browser]); 124 [[AvatarIconController alloc] initWithBrowser:browser]);
124 125
125 EXPECT_TRUE([controller labelButtonView]); 126 EXPECT_TRUE([controller labelButtonView]);
126 127
127 browser->window()->Close(); 128 browser->window()->Close();
128 } 129 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698