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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 27 matching lines...) Expand all
38 #include "chrome/common/extensions/extension_constants.h" 38 #include "chrome/common/extensions/extension_constants.h"
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
41 #include "chrome/test/base/in_process_browser_test.h" 41 #include "chrome/test/base/in_process_browser_test.h"
42 #include "chrome/test/base/test_switches.h" 42 #include "chrome/test/base/test_switches.h"
43 #include "chrome/test/base/ui_test_utils.h" 43 #include "chrome/test/base/ui_test_utils.h"
44 #include "content/public/browser/web_contents.h" 44 #include "content/public/browser/web_contents.h"
45 #include "content/public/test/test_utils.h" 45 #include "content/public/test/test_utils.h"
46 #include "extensions/browser/extension_system.h" 46 #include "extensions/browser/extension_system.h"
47 #include "testing/gtest/include/gtest/gtest.h" 47 #include "testing/gtest/include/gtest/gtest.h"
48 #include "ui/gfx/host_desktop_type.h"
48 #include "url/gurl.h" 49 #include "url/gurl.h"
49 50
50 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 51 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
51 #include "base/callback.h" 52 #include "base/callback.h"
52 #include "base/run_loop.h" 53 #include "base/run_loop.h"
53 #include "base/values.h" 54 #include "base/values.h"
54 #include "components/policy/core/browser/browser_policy_connector.h" 55 #include "components/policy/core/browser/browser_policy_connector.h"
55 #include "components/policy/core/common/external_data_fetcher.h" 56 #include "components/policy/core/common/external_data_fetcher.h"
56 #include "components/policy/core/common/mock_configuration_policy_provider.h" 57 #include "components/policy/core/common/mock_configuration_policy_provider.h"
57 #include "components/policy/core/common/policy_map.h" 58 #include "components/policy/core/common/policy_map.h"
(...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1625 ASSERT_EQ(1, tab_strip->count()); 1626 ASSERT_EQ(1, tab_strip->count());
1626 EXPECT_EQ("title1.html", 1627 EXPECT_EQ("title1.html",
1627 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); 1628 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());
1628 } 1629 }
1629 #endif // defined(ENABLE_CONFIGURATION_POLICY) 1630 #endif // defined(ENABLE_CONFIGURATION_POLICY)
1630 1631
1631 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || 1632 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) ||
1632 // defined(ENABLE_CONFIGURATION_POLICY) 1633 // defined(ENABLE_CONFIGURATION_POLICY)
1633 1634
1634 #endif // !defined(OS_CHROMEOS) 1635 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/default_browser_prompt.h ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698