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

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

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include missing browsertest .js file in chrome_tests.gypi Created 6 years, 2 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/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "content/public/browser/web_ui.h" 63 #include "content/public/browser/web_ui.h"
64 #include "grit/options_resources.h" 64 #include "grit/options_resources.h"
65 #include "grit/theme_resources.h" 65 #include "grit/theme_resources.h"
66 #include "net/base/escape.h" 66 #include "net/base/escape.h"
67 #include "ui/base/l10n/l10n_util.h" 67 #include "ui/base/l10n/l10n_util.h"
68 #include "ui/base/resource/resource_bundle.h" 68 #include "ui/base/resource/resource_bundle.h"
69 #include "ui/base/webui/jstemplate_builder.h" 69 #include "ui/base/webui/jstemplate_builder.h"
70 #include "ui/base/webui/web_ui_util.h" 70 #include "ui/base/webui/web_ui_util.h"
71 #include "url/gurl.h" 71 #include "url/gurl.h"
72 72
73 #if defined(ENABLE_MANAGED_USERS)
74 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler .h"
75 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h"
76 #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h"
77 #endif
78
73 #if defined(OS_CHROMEOS) 79 #if defined(OS_CHROMEOS)
74 #include "chrome/browser/browser_process_platform_part.h" 80 #include "chrome/browser/browser_process_platform_part.h"
75 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 81 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
76 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 82 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
77 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 83 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
78 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 84 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
79 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 85 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
80 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 86 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
81 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h " 87 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h "
82 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 88 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 295 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
290 #endif 296 #endif
291 AddOptionsPageUIHandler(localized_strings, 297 AddOptionsPageUIHandler(localized_strings,
292 new LanguageDictionaryOverlayHandler()); 298 new LanguageDictionaryOverlayHandler());
293 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 299 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
294 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 300 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
295 AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler()); 301 AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler());
296 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 302 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
297 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 303 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
298 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 304 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
305 #if defined(ENABLE_MANAGED_USERS)
299 AddOptionsPageUIHandler(localized_strings, 306 AddOptionsPageUIHandler(localized_strings,
300 new SupervisedUserCreateConfirmHandler()); 307 new SupervisedUserCreateConfirmHandler());
301 AddOptionsPageUIHandler(localized_strings, new SupervisedUserImportHandler()); 308 AddOptionsPageUIHandler(localized_strings, new SupervisedUserImportHandler());
302 AddOptionsPageUIHandler(localized_strings, 309 AddOptionsPageUIHandler(localized_strings,
303 new SupervisedUserLearnMoreHandler()); 310 new SupervisedUserLearnMoreHandler());
311 #endif
304 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler( 312 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler(
305 g_browser_process->profile_manager())); 313 g_browser_process->profile_manager()));
306 AddOptionsPageUIHandler(localized_strings, new WebsiteSettingsHandler()); 314 AddOptionsPageUIHandler(localized_strings, new WebsiteSettingsHandler());
307 #if defined(OS_CHROMEOS) 315 #if defined(OS_CHROMEOS)
308 AddOptionsPageUIHandler(localized_strings, 316 AddOptionsPageUIHandler(localized_strings,
309 new chromeos::options::AccountsOptionsHandler()); 317 new chromeos::options::AccountsOptionsHandler());
310 AddOptionsPageUIHandler(localized_strings, 318 AddOptionsPageUIHandler(localized_strings,
311 new chromeos::options::BluetoothOptionsHandler()); 319 new chromeos::options::BluetoothOptionsHandler());
312 AddOptionsPageUIHandler(localized_strings, 320 AddOptionsPageUIHandler(localized_strings,
313 new chromeos::options::DateTimeOptionsHandler()); 321 new chromeos::options::DateTimeOptionsHandler());
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 // Add only if handler's service is enabled. 475 // Add only if handler's service is enabled.
468 if (handler->IsEnabled()) { 476 if (handler->IsEnabled()) {
469 // Add handler to the list and also pass the ownership. 477 // Add handler to the list and also pass the ownership.
470 web_ui()->AddMessageHandler(handler.release()); 478 web_ui()->AddMessageHandler(handler.release());
471 handler_raw->GetLocalizedValues(localized_strings); 479 handler_raw->GetLocalizedValues(localized_strings);
472 handlers_.push_back(handler_raw); 480 handlers_.push_back(handler_raw);
473 } 481 }
474 } 482 }
475 483
476 } // namespace options 484 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/create_profile_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698