Skip to content

GitLab

T
tangled
Commit eb861854 authored by guohui@chromium.org's avatar guohui@chromium.org
Browse files
Options

Rename inline sign in URL to chrome-signin 

BUG=311019
R=atwilson@chromium.org, rogerta@chromium.org, xiyuan@chromium.org

Review URL: https://codereview.chromium.org/47603008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233316 0039d316-1c4b-4281-b951-d872f2087c98
parent bc330ca8
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
chrome/browser/resources/gaia_auth/inline_injected.js
View file @ eb861854
......@@ -36,7 +36,7 @@
attemptToken: new Date().getTime(),
chooseWhatToSync: chooseWhatToSync};
extWindow.postMessage(msg, 'chrome://inline-login');
extWindow.postMessage(msg, 'chrome://chrome-signin');
console.log('Credentials sent');
return;
......
chrome/browser/resources/inline_login/inline_login.html
View file @ eb861854
......@@ -2,13 +2,13 @@
<html i18n-values="dir:textdirection">
<head>
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
<link rel="stylesheet" href="chrome://inline-login/inline_login.css">
<link rel="stylesheet" href="chrome://chrome-signin/inline_login.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://inline-login/inline_login.js"></script>
<script src="chrome://inline-login/strings.js"></script>
<script src="chrome://chrome-signin/inline_login.js"></script>
<script src="chrome://chrome-signin/strings.js"></script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div id="contents" class="loading">
......
chrome/browser/signin/signin_promo.cc
View file @ eb861854
......@@ -179,7 +179,7 @@ GURL GetPromoURL(Source source, bool auto_close) {
bool enable_inline = CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableInlineSignin);
if (enable_inline) {
std::string url(chrome::kChromeUIInlineLoginURL);
std::string url(chrome::kChromeUIChromeSigninURL);
base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeySource, source);
if (auto_close)
base::StringAppendF(
......
chrome/browser/ui/sync/inline_login_dialog.cc
View file @ eb861854
......@@ -28,7 +28,7 @@ string16 InlineLoginDialog::GetDialogTitle() const {
}
GURL InlineLoginDialog::GetDialogContentURL() const {
return GURL(chrome::kChromeUIInlineLoginURL);
return GURL(chrome::kChromeUIChromeSigninURL);
}
void InlineLoginDialog::GetWebUIMessageHandlers(
......
chrome/browser/ui/sync/inline_login_dialog.h
View file @ eb861854
......@@ -15,7 +15,7 @@
class Profile;
// A dialog to host the inline sign-in WebUI. Currently, it loads
// chrome:://inline-login and dismisses itself when the sign-in is finished
// chrome:://chrome-signin and dismisses itself when the sign-in is finished
// successfully.
class InlineLoginDialog : public ui::WebDialogDelegate {
public:
......
chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
View file @ eb861854
......@@ -253,7 +253,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<FlagsUI>;
if (url.host() == chrome::kChromeUIHistoryFrameHost)
return &NewWebUI<HistoryUI>;
if (url.host() == chrome::kChromeUIInlineLoginHost)
if (url.host() == chrome::kChromeUIChromeSigninHost)
return &NewWebUI<InlineLoginUI>;
if (url.host() == chrome::kChromeUIInstantHost)
return &NewWebUI<InstantUI>;
......
chrome/browser/ui/webui/inline_login_ui.cc
View file @ eb861854
......@@ -49,7 +49,7 @@ namespace {
content::WebUIDataSource* CreateWebUIDataSource() {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIInlineLoginHost);
content::WebUIDataSource::Create(chrome::kChromeUIChromeSigninHost);
source->SetUseJsonJSFormatV2();
source->SetJsonPath("strings.js");
......
chrome/common/url_constants.cc
View file @ eb861854
......@@ -29,6 +29,7 @@ const char kChromeUIAppsURL[] = "chrome://apps/";
const char kChromeUIAppListStartPageURL[] = "chrome://app-list/";
const char kChromeUIBookmarksURL[] = "chrome://bookmarks/";
const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
const char kChromeUICloudPrintResourcesURL[] = "chrome://cloudprintresources/";
const char kChromeUIComponentsURL[] = "chrome://components/";
......@@ -53,7 +54,6 @@ const char kChromeUIHelpFrameURL[] = "chrome://help-frame/";
const char kChromeUIHistoryURL[] = "chrome://history/";
const char kChromeUIHistoryFrameURL[] = "chrome://history-frame/";
const char kChromeUIIdentityInternalsURL[] = "chrome://identity-internals/";
const char kChromeUIInlineLoginURL[] = "chrome://inline-login/";
const char kChromeUIInspectURL[] = "chrome://inspect/";
const char kChromeUIInstantURL[] = "chrome://instant/";
const char kChromeUIIPCURL[] = "chrome://ipc/";
......@@ -145,6 +145,7 @@ const char kChromeUIAppListStartPageHost[] = "app-list";
const char kChromeUIBookmarksHost[] = "bookmarks";
const char kChromeUICacheHost[] = "cache";
const char kChromeUICertificateViewerHost[] = "view-cert";
const char kChromeUIChromeSigninHost[] = "chrome-signin";
const char kChromeUIChromeURLsHost[] = "chrome-urls";
const char kChromeUICloudPrintResourcesHost[] = "cloudprintresources";
const char kChromeUICloudPrintSetupHost[] = "cloudprintsetup";
......@@ -177,7 +178,6 @@ const char kChromeUIHelpHost[] = "help";
const char kChromeUIHistoryHost[] = "history";
const char kChromeUIHistoryFrameHost[] = "history-frame";
const char kChromeUIIdentityInternalsHost[] = "identity-internals";
const char kChromeUIInlineLoginHost[] = "inline-login";
const char kChromeUIInspectHost[] = "inspect";
const char kChromeUIInstantHost[] = "instant";
const char kChromeUIIPCHost[] = "ipc";
......
chrome/common/url_constants.h
View file @ eb861854
......@@ -27,6 +27,7 @@ extern const char kChromeUIAppsURL[];
extern const char kChromeUIAppListStartPageURL[];
extern const char kChromeUIBookmarksURL[];
extern const char kChromeUICertificateViewerURL[];
extern const char kChromeUIChromeSigninURL[];
extern const char kChromeUIChromeURLsURL[];
extern const char kChromeUICloudPrintResourcesURL[];
extern const char kChromeUIComponentsURL[];
......@@ -50,7 +51,6 @@ extern const char kChromeUIHelpFrameURL[];
extern const char kChromeUIHistoryURL[];
extern const char kChromeUIHistoryFrameURL[];
extern const char kChromeUIIdentityInternalsURL[];
extern const char kChromeUIInlineLoginURL[];
extern const char kChromeUIInspectURL[];
extern const char kChromeUIInstantURL[];
extern const char kChromeUIIPCURL[];
......@@ -137,6 +137,7 @@ extern const char kChromeUIAppListStartPageHost[];
extern const char kChromeUIBookmarksHost[];
extern const char kChromeUICacheHost[];
extern const char kChromeUICertificateViewerHost[];
extern const char kChromeUIChromeSigninHost[];
extern const char kChromeUIChromeURLsHost[];
extern const char kChromeUICloudPrintResourcesHost[];
extern const char kChromeUICloudPrintSetupHost[];
......@@ -169,7 +170,6 @@ extern const char kChromeUIHangHost[];
extern const char kChromeUIHistoryHost[];
extern const char kChromeUIHistoryFrameHost[];
extern const char kChromeUIIdentityInternalsHost[];
extern const char kChromeUIInlineLoginHost[];
extern const char kChromeUIInspectHost[];
extern const char kChromeUIInstantHost[];
extern const char kChromeUIIPCHost[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment