diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 23:20:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 23:20:40 +0000 |
| commit | 4c492a126e665b8133b6fb3eba2a66d56d13fa57 (patch) | |
| tree | 859c9550fe7bd1abf9e1b3ee0531e1e8e809243b /chrome | |
| parent | 67a4ca79e7f0e3c9587be1c2957983e70adfbfb6 (diff) | |
| download | chromium_src-4c492a126e665b8133b6fb3eba2a66d56d13fa57.zip chromium_src-4c492a126e665b8133b6fb3eba2a66d56d13fa57.tar.gz chromium_src-4c492a126e665b8133b6fb3eba2a66d56d13fa57.tar.bz2 | |
Fix regression with app window titles.
Review URL: http://codereview.chromium.org/7039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/frame/opaque_non_client_view.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc index 2260dc0..4669d12 100644 --- a/chrome/browser/views/frame/opaque_non_client_view.cc +++ b/chrome/browser/views/frame/opaque_non_client_view.cc @@ -965,11 +965,8 @@ void OpaqueNonClientView::LayoutOTRAvatar() { } void OpaqueNonClientView::LayoutDistributorLogo() { - if (distributor_logo_.empty()) - return; - - int logo_w = distributor_logo_.width(); - int logo_h = distributor_logo_.height(); + int logo_w = distributor_logo_.empty() ? 0 : distributor_logo_.width(); + int logo_h = distributor_logo_.empty() ? 0 : distributor_logo_.height(); int logo_x = 0; if (UILayoutIsRightToLeft()) { |