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

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

Issue 11929016: Move jstemplate_builder.* to ui\webui so it can be reused by webui implementations outside of chrom… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to 177705 to get yfriendman's fix Created 7 years, 11 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/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/callback.h" 10 #include "base/callback.h"
(...skipping 26 matching lines...) Expand all
37 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 37 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
38 #include "chrome/browser/ui/webui/options/managed_user_settings_handler.h" 38 #include "chrome/browser/ui/webui/options/managed_user_settings_handler.h"
39 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" 39 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
40 #include "chrome/browser/ui/webui/options/media_galleries_handler.h" 40 #include "chrome/browser/ui/webui/options/media_galleries_handler.h"
41 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" 41 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
42 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 42 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
43 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 43 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
44 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 44 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
45 #include "chrome/browser/ui/webui/theme_source.h" 45 #include "chrome/browser/ui/webui/theme_source.h"
46 #include "chrome/browser/ui/webui/web_ui_util.h" 46 #include "chrome/browser/ui/webui/web_ui_util.h"
47 #include "chrome/common/jstemplate_builder.h"
48 #include "chrome/common/time_format.h" 47 #include "chrome/common/time_format.h"
49 #include "chrome/common/url_constants.h" 48 #include "chrome/common/url_constants.h"
50 #include "content/public/browser/notification_types.h" 49 #include "content/public/browser/notification_types.h"
51 #include "content/public/browser/render_view_host.h" 50 #include "content/public/browser/render_view_host.h"
52 #include "content/public/browser/url_data_source.h" 51 #include "content/public/browser/url_data_source.h"
53 #include "content/public/browser/web_contents.h" 52 #include "content/public/browser/web_contents.h"
54 #include "content/public/browser/web_contents_delegate.h" 53 #include "content/public/browser/web_contents_delegate.h"
55 #include "content/public/browser/web_ui.h" 54 #include "content/public/browser/web_ui.h"
56 #include "grit/chromium_strings.h" 55 #include "grit/chromium_strings.h"
57 #include "grit/generated_resources.h" 56 #include "grit/generated_resources.h"
58 #include "grit/locale_settings.h" 57 #include "grit/locale_settings.h"
59 #include "grit/options_resources.h" 58 #include "grit/options_resources.h"
60 #include "grit/theme_resources.h" 59 #include "grit/theme_resources.h"
61 #include "net/base/escape.h" 60 #include "net/base/escape.h"
62 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
62 #include "ui/webui/jstemplate_builder.h"
63 63
64 #if defined(OS_CHROMEOS) 64 #if defined(OS_CHROMEOS)
65 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 65 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
66 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 66 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
67 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 67 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
68 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 68 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
69 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 69 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
70 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 70 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
71 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 71 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
72 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 72 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 // Add only if handler's service is enabled. 409 // Add only if handler's service is enabled.
410 if (handler->IsEnabled()) { 410 if (handler->IsEnabled()) {
411 // Add handler to the list and also pass the ownership. 411 // Add handler to the list and also pass the ownership.
412 web_ui()->AddMessageHandler(handler.release()); 412 web_ui()->AddMessageHandler(handler.release());
413 handler_raw->GetLocalizedValues(localized_strings); 413 handler_raw->GetLocalizedValues(localized_strings);
414 handlers_.push_back(handler_raw); 414 handlers_.push_back(handler_raw);
415 } 415 }
416 } 416 }
417 417
418 } // namespace options 418 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc ('k') | chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698