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

Unified Diff: chrome/browser/views/extensions/extension_shelf.h

Issue 160276: mole expand/collapse API (Closed)
Patch Set: fixed a couple of crashers Created 11 years, 5 months 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
« no previous file with comments | « chrome/browser/gtk/extension_shelf_gtk.cc ('k') | chrome/browser/views/extensions/extension_shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/extensions/extension_shelf.h
diff --git a/chrome/browser/views/extensions/extension_shelf.h b/chrome/browser/views/extensions/extension_shelf.h
index 57a09540da308d7c645de74cdc8730d74e716396..e0dbe5d6712649c99c8513e208620fbb9ef4abb1 100644
--- a/chrome/browser/views/extensions/extension_shelf.h
+++ b/chrome/browser/views/extensions/extension_shelf.h
@@ -27,7 +27,7 @@ class ExtensionShelf : public views::View,
virtual ~ExtensionShelf();
// Get the current model.
- ExtensionShelfModel* model() { return model_.get(); }
+ ExtensionShelfModel* model() { return model_; }
// View
virtual void Paint(gfx::Canvas* canvas);
@@ -50,9 +50,10 @@ class ExtensionShelf : public views::View,
virtual void ToolstripMoved(ExtensionHost* toolstrip,
int from_index,
int to_index);
- virtual void ToolstripChangedAt(ExtensionHost* toolstrip, int index);
+ virtual void ToolstripChanged(ExtensionShelfModel::iterator toolstrip);
virtual void ExtensionShelfEmpty();
virtual void ShelfModelReloaded();
+ virtual void ShelfModelDeleting();
protected:
// View
@@ -66,6 +67,13 @@ class ExtensionShelf : public views::View,
// Dragging toolstrips
void DropExtension(Toolstrip* handle, const gfx::Point& pt, bool cancel);
+ // Expand the specified toolstrip, navigating to |url| if non-empty,
+ // and setting the |height|.
+ void ExpandToolstrip(ExtensionHost* host, const GURL& url, int height);
+
+ // Collapse the specified toolstrip, navigating to |url| if non-empty.
+ void CollapseToolstrip(ExtensionHost* host, const GURL& url);
+
// Inits the background bitmap.
void InitBackground(gfx::Canvas* canvas, const SkRect& subset);
@@ -86,7 +94,7 @@ class ExtensionShelf : public views::View,
SkBitmap background_;
// The model representing the toolstrips on the shelf.
- scoped_ptr<ExtensionShelfModel> model_;
+ ExtensionShelfModel* model_;
// Storage of strings needed for accessibility.
std::wstring accessible_name_;
« no previous file with comments | « chrome/browser/gtk/extension_shelf_gtk.cc ('k') | chrome/browser/views/extensions/extension_shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698