| Index: chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| index e1a13ebc05e51aec4e03bedbd840f34e549004ff..94ce9d00ac65e04d09e749460b45c0fc9fbb97aa 100644
|
| --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| @@ -50,8 +50,8 @@ ChromeWebUIDataSource* CreateSetAsDefaultBrowserUIHTMLSource() {
|
| IDS_METRO_FLOW_DESCRIPTION);
|
| data_source->AddLocalizedString("flowNext",
|
| IDS_METRO_FLOW_SET_DEFAULT);
|
| - data_source->AddLocalizedString("flowCancel",
|
| - IDS_METRO_FLOW_SET_DEFAULT_CANCEL);
|
| + data_source->AddLocalizedString("chromeLogoString",
|
| + IDS_METRO_FLOW_LOGO_STRING_ALT);
|
| data_source->set_json_path("strings.js");
|
| data_source->add_resource_path("set_as_default_browser.js",
|
| IDR_SET_AS_DEFAULT_BROWSER_JS);
|
| @@ -83,9 +83,6 @@ class SetAsDefaultBrowserHandler
|
| // Handler for the 'Next' (or 'make Chrome the Metro browser') button.
|
| void HandleLaunchSetDefaultBrowserFlow(const ListValue* args);
|
|
|
| - // Handler for the 'No, thanks' (Cancel) button.
|
| - void HandleReturnToBrowser(const ListValue* args);
|
| -
|
| // Close this web ui.
|
| void ConcludeInteraction();
|
|
|
| @@ -116,10 +113,6 @@ void SetAsDefaultBrowserHandler::RegisterMessages() {
|
| "SetAsDefaultBrowser:LaunchSetDefaultBrowserFlow",
|
| base::Bind(&SetAsDefaultBrowserHandler::HandleLaunchSetDefaultBrowserFlow,
|
| base::Unretained(this)));
|
| - web_ui()->RegisterMessageCallback(
|
| - "SetAsDefaultBrowser:ReturnToBrowser",
|
| - base::Bind(&SetAsDefaultBrowserHandler::HandleReturnToBrowser,
|
| - base::Unretained(this)));
|
| }
|
|
|
| void SetAsDefaultBrowserHandler::SetDefaultWebClientUIState(
|
| @@ -163,10 +156,6 @@ void SetAsDefaultBrowserHandler::HandleLaunchSetDefaultBrowserFlow(
|
| default_browser_worker_->StartSetAsDefault();
|
| }
|
|
|
| -void SetAsDefaultBrowserHandler::HandleReturnToBrowser(const ListValue* args) {
|
| - ConcludeInteraction();
|
| -}
|
| -
|
| void SetAsDefaultBrowserHandler::ConcludeInteraction() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| WebContents* contents = web_ui()->GetWebContents();
|
|
|