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

Side by Side Diff: chrome/browser/ui/views/infobars/extension_infobar.h

Issue 7796010: Attempt at fixing crash in menus shown from infobars. Here's what the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_
6 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ 6 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/extensions/extension_infobar_delegate.h" 9 #include "chrome/browser/extensions/extension_infobar_delegate.h"
10 #include "chrome/browser/extensions/image_loading_tracker.h" 10 #include "chrome/browser/extensions/image_loading_tracker.h"
(...skipping 11 matching lines...) Expand all
22 public ExtensionInfoBarDelegate::DelegateObserver, 22 public ExtensionInfoBarDelegate::DelegateObserver,
23 public views::ViewMenuDelegate { 23 public views::ViewMenuDelegate {
24 public: 24 public:
25 ExtensionInfoBar(TabContentsWrapper* owner, 25 ExtensionInfoBar(TabContentsWrapper* owner,
26 ExtensionInfoBarDelegate* delegate); 26 ExtensionInfoBarDelegate* delegate);
27 27
28 private: 28 private:
29 virtual ~ExtensionInfoBar(); 29 virtual ~ExtensionInfoBar();
30 30
31 // InfoBarView: 31 // InfoBarView:
32 virtual void Layout(); 32 virtual void Layout() OVERRIDE;
33 virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child); 33 virtual void ViewHierarchyChanged(bool is_add,
34 virtual int ContentMinimumWidth() const; 34 View* parent,
35 View* child) OVERRIDE;
36 virtual int ContentMinimumWidth() const OVERRIDE;
37 virtual void CancelMenu() OVERRIDE;
35 38
36 // ImageLoadingTracker::Observer: 39 // ImageLoadingTracker::Observer:
37 virtual void OnImageLoaded(SkBitmap* image, 40 virtual void OnImageLoaded(SkBitmap* image,
38 const ExtensionResource& resource, 41 const ExtensionResource& resource,
39 int index); 42 int index);
40 43
41 // ExtensionInfoBarDelegate::DelegateObserver: 44 // ExtensionInfoBarDelegate::DelegateObserver:
42 virtual void OnDelegateDeleted(); 45 virtual void OnDelegateDeleted();
43 46
44 // views::ViewMenuDelegate: 47 // views::ViewMenuDelegate:
(...skipping 11 matching lines...) Expand all
56 59
57 // Keeps track of images being loaded on the File thread. 60 // Keeps track of images being loaded on the File thread.
58 ImageLoadingTracker tracker_; 61 ImageLoadingTracker tracker_;
59 62
60 scoped_ptr<views::MenuRunner> menu_runner_; 63 scoped_ptr<views::MenuRunner> menu_runner_;
61 64
62 DISALLOW_COPY_AND_ASSIGN(ExtensionInfoBar); 65 DISALLOW_COPY_AND_ASSIGN(ExtensionInfoBar);
63 }; 66 };
64 67
65 #endif // CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ 68 #endif // CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698