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

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

Issue 10835016: Rename media gallery -> media galleries in pref/UI components. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/ui/webui/options2/media_gallery_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/options2/options_ui.h" 5 #include "chrome/browser/ui/webui/options2/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 17 matching lines...) Expand all
28 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h" 28 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
29 #include "chrome/browser/ui/webui/options2/content_settings_handler.h" 29 #include "chrome/browser/ui/webui/options2/content_settings_handler.h"
30 #include "chrome/browser/ui/webui/options2/cookies_view_handler.h" 30 #include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
31 #include "chrome/browser/ui/webui/options2/core_options_handler.h" 31 #include "chrome/browser/ui/webui/options2/core_options_handler.h"
32 #include "chrome/browser/ui/webui/options2/font_settings_handler.h" 32 #include "chrome/browser/ui/webui/options2/font_settings_handler.h"
33 #include "chrome/browser/ui/webui/options2/handler_options_handler.h" 33 #include "chrome/browser/ui/webui/options2/handler_options_handler.h"
34 #include "chrome/browser/ui/webui/options2/home_page_overlay_handler.h" 34 #include "chrome/browser/ui/webui/options2/home_page_overlay_handler.h"
35 #include "chrome/browser/ui/webui/options2/import_data_handler.h" 35 #include "chrome/browser/ui/webui/options2/import_data_handler.h"
36 #include "chrome/browser/ui/webui/options2/language_options_handler.h" 36 #include "chrome/browser/ui/webui/options2/language_options_handler.h"
37 #include "chrome/browser/ui/webui/options2/manage_profile_handler.h" 37 #include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
38 #include "chrome/browser/ui/webui/options2/media_gallery_handler.h" 38 #include "chrome/browser/ui/webui/options2/media_galleries_handler.h"
39 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h" 39 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
40 #include "chrome/browser/ui/webui/options2/password_manager_handler.h" 40 #include "chrome/browser/ui/webui/options2/password_manager_handler.h"
41 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h" 41 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
42 #include "chrome/browser/ui/webui/options2/startup_pages_handler.h" 42 #include "chrome/browser/ui/webui/options2/startup_pages_handler.h"
43 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h" 43 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
44 #include "chrome/browser/ui/webui/theme_source.h" 44 #include "chrome/browser/ui/webui/theme_source.h"
45 #include "chrome/common/jstemplate_builder.h" 45 #include "chrome/common/jstemplate_builder.h"
46 #include "chrome/common/time_format.h" 46 #include "chrome/common/time_format.h"
47 #include "chrome/common/url_constants.h" 47 #include "chrome/common/url_constants.h"
48 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler()); 228 AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler());
229 229
230 BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler(); 230 BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler();
231 AddOptionsPageUIHandler(localized_strings, browser_options_handler); 231 AddOptionsPageUIHandler(localized_strings, browser_options_handler);
232 232
233 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler()); 233 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
234 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); 234 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
235 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler()); 235 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
236 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); 236 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
237 AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler()); 237 AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
238 AddOptionsPageUIHandler(localized_strings, new MediaGalleryHandler()); 238 AddOptionsPageUIHandler(localized_strings, new MediaGalleriesHandler());
239 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler()); 239 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
240 #if defined(OS_CHROMEOS) 240 #if defined(OS_CHROMEOS)
241 AddOptionsPageUIHandler(localized_strings, 241 AddOptionsPageUIHandler(localized_strings,
242 new chromeos::options2::CrosLanguageOptionsHandler()); 242 new chromeos::options2::CrosLanguageOptionsHandler());
243 #else 243 #else
244 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 244 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
245 #endif 245 #endif
246 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 246 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
247 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 247 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
248 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 248 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 // Add only if handler's service is enabled. 387 // Add only if handler's service is enabled.
388 if (handler->IsEnabled()) { 388 if (handler->IsEnabled()) {
389 // Add handler to the list and also pass the ownership. 389 // Add handler to the list and also pass the ownership.
390 web_ui()->AddMessageHandler(handler.release()); 390 web_ui()->AddMessageHandler(handler.release());
391 handler_raw->GetLocalizedValues(localized_strings); 391 handler_raw->GetLocalizedValues(localized_strings);
392 handlers_.push_back(handler_raw); 392 handlers_.push_back(handler_raw);
393 } 393 }
394 } 394 }
395 395
396 } // namespace options2 396 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/media_gallery_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698