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

Unified Diff: chrome/browser/ui/views/infobars/extension_infobar.h

Issue 7969024: Merge 101958 - Attempt at fixing crash in menus shown from infobars. Here's what the (Closed) Base URL: svn://svn.chromium.org/chrome/branches/874/src/
Patch Set: Created 9 years, 3 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
Index: chrome/browser/ui/views/infobars/extension_infobar.h
===================================================================
--- chrome/browser/ui/views/infobars/extension_infobar.h (revision 102374)
+++ chrome/browser/ui/views/infobars/extension_infobar.h (working copy)
@@ -14,7 +14,6 @@
class TabContentsWrapper;
namespace views {
class MenuButton;
-class MenuRunner;
}
class ExtensionInfoBar : public InfoBarView,
@@ -29,9 +28,11 @@
virtual ~ExtensionInfoBar();
// InfoBarView:
- virtual void Layout();
- virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
- virtual int ContentMinimumWidth() const;
+ virtual void Layout() OVERRIDE;
+ virtual void ViewHierarchyChanged(bool is_add,
+ View* parent,
+ View* child) OVERRIDE;
+ virtual int ContentMinimumWidth() const OVERRIDE;
// ImageLoadingTracker::Observer:
virtual void OnImageLoaded(SkBitmap* image,
@@ -57,8 +58,6 @@
// Keeps track of images being loaded on the File thread.
ImageLoadingTracker tracker_;
- scoped_ptr<views::MenuRunner> menu_runner_;
-
DISALLOW_COPY_AND_ASSIGN(ExtensionInfoBar);
};
« no previous file with comments | « chrome/browser/ui/views/infobars/confirm_infobar.h ('k') | chrome/browser/ui/views/infobars/extension_infobar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698