summaryrefslogtreecommitdiffstats
path: root/chrome/browser/toolbar_model.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-08 01:22:15 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-08 01:22:15 +0000
commit810a52ef77564f1674a600317175743176bcc965 (patch)
treee18a35b4ef980bdb8eaad3c5812228a6e1b3ba16 /chrome/browser/toolbar_model.cc
parent673ccc1d607a6d7d280d89fedd3fb3bc906a7e27 (diff)
downloadchromium_src-810a52ef77564f1674a600317175743176bcc965.zip
chromium_src-810a52ef77564f1674a600317175743176bcc965.tar.gz
chromium_src-810a52ef77564f1674a600317175743176bcc965.tar.bz2
Remove most uses of EmptyString(), EmptyWString(), EmptyString16(), and EmptyGURL(), since the code in question can just use the default constructor.
BUG=none TEST=none Review URL: http://codereview.chromium.org/517054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/toolbar_model.cc')
-rw-r--r--chrome/browser/toolbar_model.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index b3bb005..252b99f 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -123,9 +123,8 @@ void ToolbarModel::GetIconHoverText(std::wstring* text) {
switch (ssl.security_style()) {
case SECURITY_STYLE_AUTHENTICATED: {
if (ssl.has_mixed_content()) {
- SSLErrorInfo error_info =
- SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS,
- NULL, GURL::EmptyGURL());
+ SSLErrorInfo error_info = SSLErrorInfo::CreateError(
+ SSLErrorInfo::MIXED_CONTENTS, NULL, GURL());
text->assign(error_info.short_description());
} else {
DCHECK(entry->url().has_host());
@@ -191,11 +190,11 @@ void ToolbarModel::CreateErrorText(NavigationEntry* entry, std::wstring* text) {
&errors);
if (ssl.has_mixed_content()) {
errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS,
- NULL, GURL::EmptyGURL()));
+ NULL, GURL()));
}
if (ssl.has_unsafe_content()) {
errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::UNSAFE_CONTENTS,
- NULL, GURL::EmptyGURL()));
+ NULL, GURL()));
}
int error_count = static_cast<int>(errors.size());