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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/options/options_ui.cc

Issue 10837331: Options: s/options2/options/. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.h ('k') | chrome/browser/ui/webui/options/options_ui_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/options_ui.cc
diff --git a/chrome/browser/ui/webui/options2/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
similarity index 82%
rename from chrome/browser/ui/webui/options2/options_ui.cc
rename to chrome/browser/ui/webui/options/options_ui.cc
index d2134491545b6270adf1455c8c7abc86607e2f2e..afb852f7700dd32528744bf58b2618cdf6caad6d 100644
--- a/chrome/browser/ui/webui/options2/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/options2/options_ui.h"
+#include "chrome/browser/ui/webui/options/options_ui.h"
#include <algorithm>
#include <vector>
@@ -23,24 +23,24 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/options2/autofill_options_handler.h"
-#include "chrome/browser/ui/webui/options2/browser_options_handler.h"
-#include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
-#include "chrome/browser/ui/webui/options2/content_settings_handler.h"
-#include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
-#include "chrome/browser/ui/webui/options2/core_options_handler.h"
-#include "chrome/browser/ui/webui/options2/font_settings_handler.h"
-#include "chrome/browser/ui/webui/options2/handler_options_handler.h"
-#include "chrome/browser/ui/webui/options2/home_page_overlay_handler.h"
-#include "chrome/browser/ui/webui/options2/import_data_handler.h"
-#include "chrome/browser/ui/webui/options2/language_options_handler.h"
-#include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
-#include "chrome/browser/ui/webui/options2/media_galleries_handler.h"
-#include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
-#include "chrome/browser/ui/webui/options2/password_manager_handler.h"
-#include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
-#include "chrome/browser/ui/webui/options2/startup_pages_handler.h"
-#include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
+#include "chrome/browser/ui/webui/options/autofill_options_handler.h"
+#include "chrome/browser/ui/webui/options/browser_options_handler.h"
+#include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
+#include "chrome/browser/ui/webui/options/content_settings_handler.h"
+#include "chrome/browser/ui/webui/options/cookies_view_handler.h"
+#include "chrome/browser/ui/webui/options/core_options_handler.h"
+#include "chrome/browser/ui/webui/options/font_settings_handler.h"
+#include "chrome/browser/ui/webui/options/handler_options_handler.h"
+#include "chrome/browser/ui/webui/options/home_page_overlay_handler.h"
+#include "chrome/browser/ui/webui/options/import_data_handler.h"
+#include "chrome/browser/ui/webui/options/language_options_handler.h"
+#include "chrome/browser/ui/webui/options/manage_profile_handler.h"
+#include "chrome/browser/ui/webui/options/media_galleries_handler.h"
+#include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
+#include "chrome/browser/ui/webui/options/password_manager_handler.h"
+#include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
+#include "chrome/browser/ui/webui/options/startup_pages_handler.h"
+#include "chrome/browser/ui/webui/options/web_intents_settings_handler.h"
#include "chrome/browser/ui/webui/theme_source.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/time_format.h"
@@ -54,7 +54,7 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
-#include "grit/options2_resources.h"
+#include "grit/options_resources.h"
#include "grit/theme_resources.h"
#include "net/base/escape.h"
#include "ui/base/layout.h"
@@ -62,31 +62,31 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/system/pointer_device_observer.h"
-#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/pointer_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"
-#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h"
+#include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
+#include "chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.h"
#endif
#if defined(OS_CHROMEOS) && defined(USE_ASH)
-#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/set_wallpaper_options_handler.h"
#endif
#if defined(USE_NSS)
-#include "chrome/browser/ui/webui/options2/certificate_manager_handler.h"
+#include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
#endif
using content::RenderViewHost;
@@ -148,11 +148,11 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
} else if (path == kOptionsBundleJsFile) {
// Return (and cache) the options javascript code.
response_bytes = ui::ResourceBundle::GetSharedInstance().
- LoadDataResourceBytes(IDR_OPTIONS2_BUNDLE_JS, ui::SCALE_FACTOR_NONE);
+ LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS, ui::SCALE_FACTOR_NONE);
} else {
// Return (and cache) the main options html page as the default.
response_bytes = ui::ResourceBundle::GetSharedInstance().
- LoadDataResourceBytes(IDR_OPTIONS2_HTML, ui::SCALE_FACTOR_NONE);
+ LoadDataResourceBytes(IDR_OPTIONS_HTML, ui::SCALE_FACTOR_NONE);
csilv 2012/08/18 20:07:38 I will assume that because of these changes and li
}
SendResponse(request_id, response_bytes);
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.h ('k') | chrome/browser/ui/webui/options/options_ui_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698