summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 17:09:05 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 17:09:05 +0000
commit478739e35c9a1992276c0f38f862e378a8de1de7 (patch)
tree11c1448ea945cb7aec25a2bdea8b115e235b9d0f /chrome/common
parentfc232b598c601e066f6a17b5c647b1e30667f38e (diff)
downloadchromium_src-478739e35c9a1992276c0f38f862e378a8de1de7.zip
chromium_src-478739e35c9a1992276c0f38f862e378a8de1de7.tar.gz
chromium_src-478739e35c9a1992276c0f38f862e378a8de1de7.tar.bz2
Basic code structures for rewritten options dialogs as DOM UI. Also includes the initial implementation of System page in ChromeOS options.
BUG=chromium-os: TEST=none yet, work in progress Review URL: http://codereview.chromium.org/2781005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/url_constants.cc2
-rw-r--r--chrome/common/url_constants.h20
2 files changed, 13 insertions, 9 deletions
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 9a9cb66..6f06ab6 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -67,6 +67,7 @@ const char kChromeUIPrintURL[] = "chrome://print/";
const char kChromeUIFavIconURL[] = "chrome://favicon/";
const char kChromeUIFileBrowseURL[] = "chrome://filebrowse/";
const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/";
+const char kChromeUIOptionsURL[] = "chrome://options/";
const char kChromeUIIPCURL[] = "chrome://about/ipc";
const char kChromeUINetworkURL[] = "chrome://about/network";
const char kChromeUINewTabURL[] = "chrome://newtab";
@@ -83,6 +84,7 @@ const char kChromeUIPrintHost[] = "print";
const char kChromeUIResourcesHost[] = "resources";
const char kChromeUIFileBrowseHost[] = "filebrowse";
const char kChromeUIMediaplayerHost[] = "mediaplayer";
+const char kChromeUIOptionsHost[] = "options";
const char kChromeUIInspectorHost[] = "inspector";
const char kChromeUINetInternalsHost[] = "net-internals";
const char kChromeUINewTabHost[] = "newtab";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 8da164d..991c9e1 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -54,15 +54,16 @@ extern const char kChromeUIBookmarksURL[];
extern const char kChromeUIDevToolsURL[];
extern const char kChromeUIDownloadsURL[];
extern const char kChromeUIExtensionsURL[];
-extern const char kChromeUIHistoryURL[];
-extern const char kChromeUIPluginsURL[];
-extern const char kChromeUIPrintURL[];
extern const char kChromeUIFavIconURL[];
extern const char kChromeUIFileBrowseURL[];
-extern const char kChromeUIMediaplayerURL[];
+extern const char kChromeUIHistoryURL[];
extern const char kChromeUIIPCURL[];
+extern const char kChromeUIMediaplayerURL[];
+extern const char kChromeUIOptionsURL[];
extern const char kChromeUINetworkURL[];
extern const char kChromeUINewTabURL[];
+extern const char kChromeUIPluginsURL[];
+extern const char kChromeUIPrintURL[];
// chrome components of URLs. Should be kept in sync with the full URLs
// above.
@@ -72,15 +73,16 @@ extern const char kChromeUIDialogHost[];
extern const char kChromeUIDownloadsHost[];
extern const char kChromeUIExtensionsHost[];
extern const char kChromeUIFavIconHost[];
-extern const char kChromeUIHistoryHost[];
-extern const char kChromeUIPluginsHost[];
-extern const char kChromeUIPrintHost[];
-extern const char kChromeUIResourcesHost[];
extern const char kChromeUIFileBrowseHost[];
-extern const char kChromeUIMediaplayerHost[];
+extern const char kChromeUIHistoryHost[];
extern const char kChromeUIInspectorHost[];
+extern const char kChromeUIMediaplayerHost[];
extern const char kChromeUINetInternalsHost[];
extern const char kChromeUINewTabHost[];
+extern const char kChromeUIOptionsHost[];
+extern const char kChromeUIPluginsHost[];
+extern const char kChromeUIPrintHost[];
+extern const char kChromeUIResourcesHost[];
extern const char kChromeUIThumbnailPath[];
extern const char kChromeUIThemePath[];