Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Unified Diff: chrome/browser/ui/views/tab_contents/tab_contents_view_views.h

Issue 8477042: Move Sad Tab implementation out of the TabContentsViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes for jochen and jam Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
index 413d01efbf0aecb1dbdd1c85779b70aaa7947256..b11f1d3b8279388d61ee637b5387886969c96289 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
@@ -16,7 +16,6 @@
class ConstrainedWindowGtk;
class NativeTabContentsView;
class RenderViewContextMenuViews;
-class SadTabView;
class SkBitmap;
struct WebDropData;
namespace gfx {
@@ -28,8 +27,6 @@ class Widget;
}
// Views-specific implementation of the TabContentsView.
-// TODO(beng): Remove last remnants of Windows-specificity, and make this
-// subclass Widget.
class TabContentsViewViews : public views::Widget,
public TabContentsView,
public internal::NativeTabContentsViewDelegate {
@@ -75,6 +72,8 @@ class TabContentsViewViews : public views::Widget,
virtual bool IsEventTracking() const;
virtual void CloseTabAfterEventTracking();
virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE;
+ virtual void InstallOverlayView(gfx::NativeView view) OVERRIDE;
+ virtual void RemoveOverlayView() OVERRIDE;
// Implementation of RenderViewHostDelegate::View.
virtual void CreateNewWindow(
@@ -152,11 +151,6 @@ class TabContentsViewViews : public views::Widget,
NativeTabContentsView* native_tab_contents_view_;
- // If non-null we're showing a sad tab. SadTabView is hosted in a separate
- // widget so that TabContentsViewViews does not need to draw, and can be
- // created without a texture.
- views::Widget* sad_tab_widget_;
-
// The id used in the ViewStorage to store the last focused view.
int last_focused_view_storage_id_;
@@ -174,6 +168,10 @@ class TabContentsViewViews : public views::Widget,
// accessible when un-parented.
mutable const views::FocusManager* focus_manager_;
+ // The overlaid view. Owned by the caller of |InstallOverlayView|; this is a
+ // weak reference.
+ views::Widget* overlaid_view_;
+
DISALLOW_COPY_AND_ASSIGN(TabContentsViewViews);
};
« no previous file with comments | « chrome/browser/ui/views/hung_renderer_view.cc ('k') | chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698