diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:33:13 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:33:13 +0000 |
| commit | 945c16c976d14eb0944ffaaadae040cad4262c0c (patch) | |
| tree | 4c44a9abaebf7436c89ceeb7bb1f096f18333784 /chrome/browser/xp_frame.cc | |
| parent | 9638a0712a9a1f7fe7404f0f6b1bb6d6c0cfa13a (diff) | |
| download | chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.zip chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.tar.gz chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.tar.bz2 | |
Unrollback r1158.
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/xp_frame.cc')
| -rw-r--r-- | chrome/browser/xp_frame.cc | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/chrome/browser/xp_frame.cc b/chrome/browser/xp_frame.cc index bb2aefe..666d94b 100644 --- a/chrome/browser/xp_frame.cc +++ b/chrome/browser/xp_frame.cc @@ -476,10 +476,13 @@ void XPFrame::Init() { frame_view_->AddViewToDropList(off_the_record_image_); } - distributor_logo_ = new ChromeViews::ImageView(); - frame_view_->AddViewToDropList(distributor_logo_); - distributor_logo_->SetImage(rb.GetBitmapNamed(IDR_DISTRIBUTOR_LOGO_LIGHT)); - frame_view_->AddChildView(distributor_logo_); + SkBitmap* image = rb.GetBitmapNamed(IDR_DISTRIBUTOR_LOGO_LIGHT); + if (!image->isNull()) { + distributor_logo_ = new ChromeViews::ImageView(); + frame_view_->AddViewToDropList(distributor_logo_); + distributor_logo_->SetImage(image); + frame_view_->AddChildView(distributor_logo_); + } min_button_ = new ChromeViews::Button(); min_button_->SetListener(this, MINIATURIZE_TAG); @@ -717,18 +720,20 @@ void XPFrame::Layout() { } } - if (IsZoomed()) { - distributor_logo_->SetVisible(false); - } else { - CSize distributor_logo_size; - distributor_logo_->GetPreferredSize(&distributor_logo_size); - distributor_logo_->SetVisible(true); - distributor_logo_->SetBounds(min_button_->GetX() - - distributor_logo_size.cx - - kDistributorLogoHorizontalOffset, - kDistributorLogoVerticalOffset, - distributor_logo_size.cx, - distributor_logo_size.cy); + if (distributor_logo_) { + if (IsZoomed()) { + distributor_logo_->SetVisible(false); + } else { + CSize distributor_logo_size; + distributor_logo_->GetPreferredSize(&distributor_logo_size); + distributor_logo_->SetVisible(true); + distributor_logo_->SetBounds(min_button_->GetX() - + distributor_logo_size.cx - + kDistributorLogoHorizontalOffset, + kDistributorLogoVerticalOffset, + distributor_logo_size.cx, + distributor_logo_size.cy); + } } tabstrip_->SetBounds(tab_strip_x, top_margin - 1, |