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

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

Issue 1494293004: Componentize strings from generated_resources needed by LocalizedError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS 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
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "components/policy/core/common/policy_map.h" 73 #include "components/policy/core/common/policy_map.h"
74 #include "components/policy/core/common/policy_namespace.h" 74 #include "components/policy/core/common/policy_namespace.h"
75 #include "components/policy/core/common/policy_service.h" 75 #include "components/policy/core/common/policy_service.h"
76 #include "components/proximity_auth/switches.h" 76 #include "components/proximity_auth/switches.h"
77 #include "components/proxy_config/proxy_config_pref_names.h" 77 #include "components/proxy_config/proxy_config_pref_names.h"
78 #include "components/search_engines/template_url.h" 78 #include "components/search_engines/template_url.h"
79 #include "components/search_engines/template_url_service.h" 79 #include "components/search_engines/template_url_service.h"
80 #include "components/signin/core/browser/signin_manager.h" 80 #include "components/signin/core/browser/signin_manager.h"
81 #include "components/signin/core/common/profile_management_switches.h" 81 #include "components/signin/core/common/profile_management_switches.h"
82 #include "components/signin/core/common/signin_pref_names.h" 82 #include "components/signin/core/common/signin_pref_names.h"
83 #include "components/strings/grit/components_strings.h"
83 #include "components/ui/zoom/page_zoom.h" 84 #include "components/ui/zoom/page_zoom.h"
84 #include "components/user_manager/user_type.h" 85 #include "components/user_manager/user_type.h"
85 #include "content/public/browser/browser_thread.h" 86 #include "content/public/browser/browser_thread.h"
86 #include "content/public/browser/download_manager.h" 87 #include "content/public/browser/download_manager.h"
87 #include "content/public/browser/navigation_controller.h" 88 #include "content/public/browser/navigation_controller.h"
88 #include "content/public/browser/notification_details.h" 89 #include "content/public/browser/notification_details.h"
89 #include "content/public/browser/notification_service.h" 90 #include "content/public/browser/notification_service.h"
90 #include "content/public/browser/notification_source.h" 91 #include "content/public/browser/notification_source.h"
91 #include "content/public/browser/notification_types.h" 92 #include "content/public/browser/notification_types.h"
92 #include "content/public/browser/url_data_source.h" 93 #include "content/public/browser/url_data_source.h"
(...skipping 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after
2143 2144
2144 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2145 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2145 #if defined(OS_CHROMEOS) 2146 #if defined(OS_CHROMEOS)
2146 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2147 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2147 #else 2148 #else
2148 return true; 2149 return true;
2149 #endif 2150 #endif
2150 } 2151 }
2151 2152
2152 } // namespace options 2153 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698