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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/profiles/profile_manager.h" 76 #include "chrome/browser/profiles/profile_manager.h"
77 #include "chrome/browser/signin/signin_manager_factory.h" 77 #include "chrome/browser/signin/signin_manager_factory.h"
78 #include "chrome/browser/ui/browser.h" 78 #include "chrome/browser/ui/browser.h"
79 #include "chrome/browser/ui/browser_commands.h" 79 #include "chrome/browser/ui/browser_commands.h"
80 #include "chrome/browser/ui/browser_finder.h" 80 #include "chrome/browser/ui/browser_finder.h"
81 #include "chrome/browser/ui/browser_list.h" 81 #include "chrome/browser/ui/browser_list.h"
82 #include "chrome/browser/ui/browser_list_observer.h" 82 #include "chrome/browser/ui/browser_list_observer.h"
83 #include "chrome/browser/ui/browser_window.h" 83 #include "chrome/browser/ui/browser_window.h"
84 #include "chrome/browser/ui/extensions/app_launch_params.h" 84 #include "chrome/browser/ui/extensions/app_launch_params.h"
85 #include "chrome/browser/ui/extensions/application_launch.h" 85 #include "chrome/browser/ui/extensions/application_launch.h"
86 #include "chrome/browser/ui/host_desktop.h"
87 #include "chrome/browser/ui/tabs/tab_strip_model.h" 86 #include "chrome/browser/ui/tabs/tab_strip_model.h"
88 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 87 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
89 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 88 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
90 #include "chrome/common/chrome_paths.h" 89 #include "chrome/common/chrome_paths.h"
91 #include "chrome/common/extensions/extension_constants.h" 90 #include "chrome/common/extensions/extension_constants.h"
92 #include "chrome/grit/chromium_strings.h" 91 #include "chrome/grit/chromium_strings.h"
93 #include "chrome/grit/generated_resources.h" 92 #include "chrome/grit/generated_resources.h"
94 #include "chromeos/chromeos_paths.h" 93 #include "chromeos/chromeos_paths.h"
95 #include "chromeos/chromeos_switches.h" 94 #include "chromeos/chromeos_switches.h"
96 #include "chromeos/dbus/fake_session_manager_client.h" 95 #include "chromeos/dbus/fake_session_manager_client.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 #include "net/url_request/url_fetcher_delegate.h" 135 #include "net/url_request/url_fetcher_delegate.h"
137 #include "net/url_request/url_request_status.h" 136 #include "net/url_request/url_request_status.h"
138 #include "policy/policy_constants.h" 137 #include "policy/policy_constants.h"
139 #include "testing/gmock/include/gmock/gmock.h" 138 #include "testing/gmock/include/gmock/gmock.h"
140 #include "third_party/icu/source/common/unicode/locid.h" 139 #include "third_party/icu/source/common/unicode/locid.h"
141 #include "ui/base/ime/chromeos/extension_ime_util.h" 140 #include "ui/base/ime/chromeos/extension_ime_util.h"
142 #include "ui/base/ime/chromeos/input_method_descriptor.h" 141 #include "ui/base/ime/chromeos/input_method_descriptor.h"
143 #include "ui/base/ime/chromeos/input_method_manager.h" 142 #include "ui/base/ime/chromeos/input_method_manager.h"
144 #include "ui/base/l10n/l10n_util.h" 143 #include "ui/base/l10n/l10n_util.h"
145 #include "ui/base/window_open_disposition.h" 144 #include "ui/base/window_open_disposition.h"
145 #include "ui/gfx/host_desktop_type.h"
146 #include "ui/gfx/image/image_skia.h" 146 #include "ui/gfx/image/image_skia.h"
147 #include "ui/views/widget/widget.h" 147 #include "ui/views/widget/widget.h"
148 #include "url/gurl.h" 148 #include "url/gurl.h"
149 149
150 namespace em = enterprise_management; 150 namespace em = enterprise_management;
151 151
152 using chromeos::LoginScreenContext; 152 using chromeos::LoginScreenContext;
153 using testing::InvokeWithoutArgs; 153 using testing::InvokeWithoutArgs;
154 using testing::Return; 154 using testing::Return;
155 using testing::_; 155 using testing::_;
(...skipping 2227 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 ASSERT_TRUE(content::ExecuteScript(contents_, 2383 ASSERT_TRUE(content::ExecuteScript(contents_,
2384 "$('tos-accept-button').click();")); 2384 "$('tos-accept-button').click();"));
2385 2385
2386 WaitForSessionStart(); 2386 WaitForSessionStart();
2387 } 2387 }
2388 2388
2389 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2389 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2390 TermsOfServiceDownloadTest, testing::Bool()); 2390 TermsOfServiceDownloadTest, testing::Bool());
2391 2391
2392 } // namespace policy 2392 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698