chrome/browser/profiles/profile_window_browsertest.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

Side by Side Diff: chrome/browser/profiles/profile_window_browsertest.cc

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

« no previous file with comments | « chrome/browser/profiles/profile_window.h ('k') | chrome/browser/safe_browsing/srt_fetcher_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2015 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 #include "chrome/browser/profiles/profile_window.h"	5 #include "chrome/browser/profiles/profile_window.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

11 #include "chrome/browser/chrome_notification_types.h"	11 #include "chrome/browser/chrome_notification_types.h"

12 #include "chrome/browser/history/history_service_factory.h"	12 #include "chrome/browser/history/history_service_factory.h"

13 #include "chrome/browser/profiles/profile_manager.h"	13 #include "chrome/browser/profiles/profile_manager.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/signin/signin_manager_factory.h"	15 #include "chrome/browser/signin/signin_manager_factory.h"

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_finder.h"	17 #include "chrome/browser/ui/browser_finder.h"

18 #include "chrome/browser/ui/browser_list.h"	18 #include "chrome/browser/ui/browser_list.h"

	19 #include "chrome/browser/ui/host_desktop.h"

19 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	20 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

20 #include "chrome/test/base/in_process_browser_test.h"	21 #include "chrome/test/base/in_process_browser_test.h"

21 #include "chrome/test/base/ui_test_utils.h"	22 #include "chrome/test/base/ui_test_utils.h"

22 #include "components/history/core/browser/history_db_task.h"	23 #include "components/history/core/browser/history_db_task.h"

23 #include "components/history/core/browser/history_service.h"	24 #include "components/history/core/browser/history_service.h"

24 #include "components/search_engines/template_url_service.h"	25 #include "components/search_engines/template_url_service.h"

25 #include "components/signin/core/common/profile_management_switches.h"	26 #include "components/signin/core/common/profile_management_switches.h"

26 #include "content/public/browser/notification_service.h"	27 #include "content/public/browser/notification_service.h"

27 #include "content/public/test/browser_test_utils.h"	28 #include "content/public/test/browser_test_utils.h"

28 #include "content/public/test/test_utils.h"	29 #include "content/public/test/test_utils.h"

(...skipping 179 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
208 WrenchMenuModel model_normal_profile(&accelerator_handler, browser());	209 WrenchMenuModel model_normal_profile(&accelerator_handler, browser());

209 EXPECT_NE(-1, model_normal_profile.GetIndexOfCommandId(IDC_BOOKMARKS_MENU));	210 EXPECT_NE(-1, model_normal_profile.GetIndexOfCommandId(IDC_BOOKMARKS_MENU));

210	211

211 // Guest browser has no bookmark menu.	212 // Guest browser has no bookmark menu.

212 Browser* guest_browser = OpenGuestBrowser();	213 Browser* guest_browser = OpenGuestBrowser();

213 WrenchMenuModel model_guest_profile(&accelerator_handler, guest_browser);	214 WrenchMenuModel model_guest_profile(&accelerator_handler, guest_browser);

214 EXPECT_EQ(-1, model_guest_profile.GetIndexOfCommandId(IDC_BOOKMARKS_MENU));	215 EXPECT_EQ(-1, model_guest_profile.GetIndexOfCommandId(IDC_BOOKMARKS_MENU));

215 }	216 }

216	217

217 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)	218 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)

OLD	NEW