diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 04:21:16 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 04:21:16 +0000 |
| commit | 60e4489819cec6689927c88a4d6114c388fe89fb (patch) | |
| tree | 68c0f7f657bee7020e3bb2922b64b86f93070e61 /chrome/renderer/renderer_glue.cc | |
| parent | f76b3b04a4c092d7db4cc2a75da4ca7fbac1f620 (diff) | |
| download | chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.zip chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.tar.gz chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.tar.bz2 | |
Change chrome-ui to chrome. I didn't go too far in converting existing strings to using the url_constant (shipshipship).
Users (such as those on Beta and Dev using session restore) attempting to load the old pages will see a blank white screen.
BUG=11272
TEST=Verify that the inspector, debugger, history, downloads and newtab pages load with chrome:// URLS. Verify that replacing the chrome:// with chrome-ui:// does not work.
Review URL: http://codereview.chromium.org/101026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_glue.cc')
| -rw-r--r-- | chrome/renderer/renderer_glue.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 75c4063..ea8129e 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -19,6 +19,7 @@ #include "base/string_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" +#include "chrome/common/url_constants.h" #include "chrome/plugin/npobject_util.h" #include "chrome/renderer/net/render_dns_master.h" #include "chrome/renderer/render_process.h" @@ -207,11 +208,12 @@ void ClipboardReadHTML(string16* markup, GURL* url) { } GURL GetInspectorURL() { - return GURL("chrome-ui://inspector/inspector.html"); + return GURL(std::string(chrome::kChromeUIScheme) + + "//inspector/inspector.html"); } std::string GetUIResourceProtocol() { - return "chrome-ui"; + return "chrome"; } bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { |