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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.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 "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #include "content/public/browser/user_metrics.h" 92 #include "content/public/browser/user_metrics.h"
93 #include "content/public/browser/web_contents.h" 93 #include "content/public/browser/web_contents.h"
94 #include "content/public/common/page_zoom.h" 94 #include "content/public/common/page_zoom.h"
95 #include "extensions/browser/extension_registry.h" 95 #include "extensions/browser/extension_registry.h"
96 #include "google_apis/gaia/gaia_auth_util.h" 96 #include "google_apis/gaia/gaia_auth_util.h"
97 #include "google_apis/gaia/google_service_auth_error.h" 97 #include "google_apis/gaia/google_service_auth_error.h"
98 #include "policy/policy_constants.h" 98 #include "policy/policy_constants.h"
99 #include "third_party/skia/include/core/SkBitmap.h" 99 #include "third_party/skia/include/core/SkBitmap.h"
100 #include "ui/base/l10n/l10n_util.h" 100 #include "ui/base/l10n/l10n_util.h"
101 #include "ui/base/webui/web_ui_util.h" 101 #include "ui/base/webui/web_ui_util.h"
102 #include "ui/gfx/host_desktop_type.h"
102 103
103 #if !defined(OS_CHROMEOS) 104 #if !defined(OS_CHROMEOS)
104 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" 105 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
105 #endif 106 #endif
106 107
107 #if defined(OS_CHROMEOS) 108 #if defined(OS_CHROMEOS)
108 #include "ash/ash_switches.h" 109 #include "ash/ash_switches.h"
109 #include "ash/desktop_background/user_wallpaper_delegate.h" 110 #include "ash/desktop_background/user_wallpaper_delegate.h"
110 #include "ash/shell.h" 111 #include "ash/shell.h"
111 #include "ash/system/chromeos/devicetype_utils.h" 112 #include "ash/system/chromeos/devicetype_utils.h"
(...skipping 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after
2183 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2184 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2184 const policy::PolicyMap& previous, 2185 const policy::PolicyMap& previous,
2185 const policy::PolicyMap& current) { 2186 const policy::PolicyMap& current) {
2186 std::set<std::string> different_keys; 2187 std::set<std::string> different_keys;
2187 current.GetDifferingKeys(previous, &different_keys); 2188 current.GetDifferingKeys(previous, &different_keys);
2188 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2189 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2189 SetupMetricsReportingCheckbox(); 2190 SetupMetricsReportingCheckbox();
2190 } 2191 }
2191 2192
2192 } // namespace options 2193 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chrome/browser/ui/webui/options/create_profile_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698