summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-29 00:59:11 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-29 00:59:11 +0000
commitc195d27a0c92eccf9eeab9cd412ac168684d5bb2 (patch)
treef88e91c7c041759dddb841bb5d9ad2a623ad38f3
parent47afa8957f8d3380f1508b879a4bb65250333786 (diff)
downloadchromium_src-c195d27a0c92eccf9eeab9cd412ac168684d5bb2.zip
chromium_src-c195d27a0c92eccf9eeab9cd412ac168684d5bb2.tar.gz
chromium_src-c195d27a0c92eccf9eeab9cd412ac168684d5bb2.tar.bz2
Fix settings crash due to sync promo change
In r119624 I made mistake when copying code from sync_setup_hander.cc to sync_setup_handler2.cc. This caused settings to crash on open. BUG= TEST= TBR=dbeam@chromium.org,jhawkins@chromium.org Review URL: https://chromiumcodereview.appspot.com/9298045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119628 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/sync_setup_handler2.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/sync_setup_handler2.cc b/chrome/browser/ui/webui/sync_setup_handler2.cc
index 82c89ec..275556f 100644
--- a/chrome/browser/ui/webui/sync_setup_handler2.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler2.cc
@@ -230,7 +230,7 @@ void SyncSetupHandler2::GetStaticLocalizedValues(
ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam(
chrome::kSyncGoogleDashboardURL))));
- bool is_launch_page = SyncPromoUI::GetIsLaunchPageForSyncPromoURL(
+ bool is_launch_page = web_ui && SyncPromoUI::GetIsLaunchPageForSyncPromoURL(
web_ui->GetWebContents()->GetURL());
int title_id = is_launch_page ? IDS_SYNC_PROMO_TITLE :
IDS_SYNC_PROMO_TITLE_EXISTING_USER;