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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 1467193003: Componentize error pages strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 5 years 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/errorpage_browsertest.cc ('k') | chrome/common/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <vector> 7 #include <vector>
8 8
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "components/policy/core/common/policy_map.h" 102 #include "components/policy/core/common/policy_map.h"
103 #include "components/policy/core/common/policy_pref_names.h" 103 #include "components/policy/core/common/policy_pref_names.h"
104 #include "components/policy/core/common/policy_service.h" 104 #include "components/policy/core/common/policy_service.h"
105 #include "components/policy/core/common/policy_service_impl.h" 105 #include "components/policy/core/common/policy_service_impl.h"
106 #include "components/policy/core/common/policy_types.h" 106 #include "components/policy/core/common/policy_types.h"
107 #include "components/search/search.h" 107 #include "components/search/search.h"
108 #include "components/search_engines/template_url.h" 108 #include "components/search_engines/template_url.h"
109 #include "components/search_engines/template_url_service.h" 109 #include "components/search_engines/template_url_service.h"
110 #include "components/security_interstitials/core/controller_client.h" 110 #include "components/security_interstitials/core/controller_client.h"
111 #include "components/ssl_config/ssl_config_prefs.h" 111 #include "components/ssl_config/ssl_config_prefs.h"
112 #include "components/strings/grit/components_strings.h"
112 #include "components/translate/core/browser/language_state.h" 113 #include "components/translate/core/browser/language_state.h"
113 #include "components/translate/core/browser/translate_infobar_delegate.h" 114 #include "components/translate/core/browser/translate_infobar_delegate.h"
114 #include "components/variations/service/variations_service.h" 115 #include "components/variations/service/variations_service.h"
115 #include "components/version_info/version_info.h" 116 #include "components/version_info/version_info.h"
116 #include "content/public/browser/browser_child_process_host_iterator.h" 117 #include "content/public/browser/browser_child_process_host_iterator.h"
117 #include "content/public/browser/browser_context.h" 118 #include "content/public/browser/browser_context.h"
118 #include "content/public/browser/browser_thread.h" 119 #include "content/public/browser/browser_thread.h"
119 #include "content/public/browser/child_process_data.h" 120 #include "content/public/browser/child_process_data.h"
120 #include "content/public/browser/download_item.h" 121 #include "content/public/browser/download_item.h"
121 #include "content/public/browser/download_manager.h" 122 #include "content/public/browser/download_manager.h"
(...skipping 3863 matching lines...) Expand 10 before | Expand all | Expand 10 after
3985 POLICY_SCOPE_USER, 3986 POLICY_SCOPE_USER,
3986 POLICY_SOURCE_CLOUD, 3987 POLICY_SOURCE_CLOUD,
3987 new base::FundamentalValue(false), 3988 new base::FundamentalValue(false),
3988 NULL); 3989 NULL);
3989 UpdateProviderPolicy(policies); 3990 UpdateProviderPolicy(policies);
3990 EXPECT_FALSE(display_manager->unified_desktop_enabled()); 3991 EXPECT_FALSE(display_manager->unified_desktop_enabled());
3991 } 3992 }
3992 #endif // defined(OS_CHROMEOS) 3993 #endif // defined(OS_CHROMEOS)
3993 3994
3994 } // namespace policy 3995 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/errorpage_browsertest.cc ('k') | chrome/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698