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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 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 | Annotate | Revision Log
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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" 98 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
99 #endif 99 #endif
100 100
101 #if defined(OS_CHROMEOS) 101 #if defined(OS_CHROMEOS)
102 #include "ash/ash_switches.h" 102 #include "ash/ash_switches.h"
103 #include "ash/desktop_background/user_wallpaper_delegate.h" 103 #include "ash/desktop_background/user_wallpaper_delegate.h"
104 #include "ash/magnifier/magnifier_constants.h" 104 #include "ash/magnifier/magnifier_constants.h"
105 #include "ash/shell.h" 105 #include "ash/shell.h"
106 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 106 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
107 #include "chrome/browser/chromeos/chromeos_utils.h" 107 #include "chrome/browser/chromeos/chromeos_utils.h"
108 #include "chrome/browser/chromeos/login/user.h" 108 #include "chrome/browser/chromeos/login/users/user.h"
109 #include "chrome/browser/chromeos/login/user_manager.h" 109 #include "chrome/browser/chromeos/login/users/user_manager.h"
110 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 110 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
111 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 111 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
112 #include "chrome/browser/chromeos/reset/metrics.h" 112 #include "chrome/browser/chromeos/reset/metrics.h"
113 #include "chrome/browser/chromeos/settings/cros_settings.h" 113 #include "chrome/browser/chromeos/settings/cros_settings.h"
114 #include "chrome/browser/chromeos/system/timezone_util.h" 114 #include "chrome/browser/chromeos/system/timezone_util.h"
115 #include "chrome/browser/policy/profile_policy_connector.h" 115 #include "chrome/browser/policy/profile_policy_connector.h"
116 #include "chrome/browser/policy/profile_policy_connector_factory.h" 116 #include "chrome/browser/policy/profile_policy_connector_factory.h"
117 #include "chrome/browser/ui/browser_window.h" 117 #include "chrome/browser/ui/browser_window.h"
118 #include "chromeos/dbus/dbus_thread_manager.h" 118 #include "chromeos/dbus/dbus_thread_manager.h"
119 #include "chromeos/dbus/power_manager_client.h" 119 #include "chromeos/dbus/power_manager_client.h"
120 #include "components/policy/core/common/policy_map.h" 120 #include "components/policy/core/common/policy_map.h"
(...skipping 1660 matching lines...) Expand 10 before | Expand all | Expand 10 after
1781 ExtensionRegistry::ENABLED); 1781 ExtensionRegistry::ENABLED);
1782 } 1782 }
1783 AppendExtensionData("newTabPage", extension, &extension_controlled); 1783 AppendExtensionData("newTabPage", extension, &extension_controlled);
1784 1784
1785 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1785 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1786 extension_controlled); 1786 extension_controlled);
1787 #endif // defined(OS_WIN) 1787 #endif // defined(OS_WIN)
1788 } 1788 }
1789 1789
1790 } // namespace options 1790 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698