Index: chrome/browser/ui/views/sad_tab_view.h |
diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h |
index 573e58c6e6ec6edc7ed2855936f1acb30b30de6e..1684ff2448f7b65851cb3dbaebf2ef8ae6c87a9e 100644 |
--- a/chrome/browser/ui/views/sad_tab_view.h |
+++ b/chrome/browser/ui/views/sad_tab_view.h |
@@ -7,18 +7,21 @@ |
#pragma once |
#include "base/basictypes.h" |
-#include "base/string16.h" |
-#include "ui/gfx/rect.h" |
+#include "base/memory/scoped_ptr.h" |
#include "views/controls/link_listener.h" |
#include "views/view.h" |
-class SkBitmap; |
class TabContents; |
namespace gfx { |
class Font; |
} |
+namespace views { |
+class ImageView; |
+class Label; |
+} |
+ |
/////////////////////////////////////////////////////////////////////////////// |
// |
// SadTabView |
@@ -48,29 +51,24 @@ class SadTabView : public views::View, |
virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; |
private: |
- // Assorted resources for display. |
- SkBitmap* sad_tab_bitmap_; |
- gfx::Font* title_font_; |
- gfx::Font* message_font_; |
- string16 title_; |
- string16 message_; |
- int title_width_; |
- |
TabContents* tab_contents_; |
- views::Link* learn_more_link_; |
- views::Link* feedback_link_; |
- |
- // Regions within the display for different components, populated by |
- // Layout(). |
- gfx::Rect icon_bounds_; |
- gfx::Rect title_bounds_; |
- gfx::Rect message_bounds_; |
- gfx::Rect learn_more_bounds_; |
- gfx::Rect feedback_bounds_; |
- |
Kind kind_; |
bool painted_; |
+ scoped_ptr<views::View> contents_view_; |
+ scoped_ptr<views::ImageView> image_; |
+ scoped_ptr<views::Label> title_; |
+ scoped_ptr<views::View> message_view_; |
+ scoped_ptr<views::Label> message_; |
+ |
+ scoped_ptr<views::View> help_view_; |
+ scoped_ptr<views::View> help_contents_view_; |
+ scoped_ptr<views::Label> help_prefix_; |
+ scoped_ptr<views::Link> help_link_; |
+ scoped_ptr<views::Label> help_suffix_; |
+ |
+ scoped_ptr<views::Link> feedback_link_; |
+ |
DISALLOW_COPY_AND_ASSIGN(SadTabView); |
}; |