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

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_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
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 #include <string> 5 #include <string>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/policy/login_policy_test_base.h" 10 #include "chrome/browser/chromeos/policy/login_policy_test_base.h"
11 #include "chrome/browser/prefs/session_startup_pref.h" 11 #include "chrome/browser/prefs/session_startup_pref.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/host_desktop.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "policy/policy_constants.h" 15 #include "policy/policy_constants.h"
16 #include "ui/gfx/host_desktop_type.h"
17 17
18 namespace policy { 18 namespace policy {
19 19
20 class UserCloudPolicyManagerTest : public LoginPolicyTestBase { 20 class UserCloudPolicyManagerTest : public LoginPolicyTestBase {
21 protected: 21 protected:
22 UserCloudPolicyManagerTest() {} 22 UserCloudPolicyManagerTest() {}
23 23
24 void GetMandatoryPoliciesValue(base::DictionaryValue* policy) const override { 24 void GetMandatoryPoliciesValue(base::DictionaryValue* policy) const override {
25 scoped_ptr<base::ListValue> list(new base::ListValue); 25 scoped_ptr<base::ListValue> list(new base::ListValue);
26 list->AppendString("chrome://policy"); 26 list->AppendString("chrome://policy");
(...skipping 25 matching lines...) Expand all
52 ASSERT_TRUE(tabs); 52 ASSERT_TRUE(tabs);
53 const int expected_tab_count = static_cast<int>(arraysize(kStartupURLs)); 53 const int expected_tab_count = static_cast<int>(arraysize(kStartupURLs));
54 EXPECT_EQ(expected_tab_count, tabs->count()); 54 EXPECT_EQ(expected_tab_count, tabs->count());
55 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) { 55 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) {
56 EXPECT_EQ(GURL(kStartupURLs[i]), 56 EXPECT_EQ(GURL(kStartupURLs[i]),
57 tabs->GetWebContentsAt(i)->GetVisibleURL()); 57 tabs->GetWebContentsAt(i)->GetVisibleURL());
58 } 58 }
59 } 59 }
60 60
61 } // namespace policy 61 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698