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

Side by Side Diff: chrome/browser/media_gallery/media_galleries_dialog_controller.h

Issue 11369253: Fix crash when programatically closing media gallery dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_
6 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_ 6 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 // Called by the view. 70 // Called by the view.
71 virtual string16 GetHeader() const; 71 virtual string16 GetHeader() const;
72 virtual string16 GetSubtext() const; 72 virtual string16 GetSubtext() const;
73 virtual bool HasPermittedGalleries() const; 73 virtual bool HasPermittedGalleries() const;
74 virtual void OnAddFolderClicked(); 74 virtual void OnAddFolderClicked();
75 virtual void DidToggleGallery(const MediaGalleryPrefInfo* pref_info, 75 virtual void DidToggleGallery(const MediaGalleryPrefInfo* pref_info,
76 bool enabled); 76 bool enabled);
77 virtual void DialogFinished(bool accepted); 77 virtual void DialogFinished(bool accepted);
78 virtual const KnownGalleryPermissions& permissions() const; 78 virtual const KnownGalleryPermissions& permissions() const;
79 virtual content::WebContents* web_contents() const;
79 80
80 // SelectFileDialog::Listener implementation: 81 // SelectFileDialog::Listener implementation:
81 virtual void FileSelected(const FilePath& path, 82 virtual void FileSelected(const FilePath& path,
82 int index, 83 int index,
83 void* params) OVERRIDE; 84 void* params) OVERRIDE;
84 content::WebContents* web_contents() const {
85 return web_contents_;
86 }
87 85
88 protected: 86 protected:
89 // For use with tests. 87 // For use with tests.
90 MediaGalleriesDialogController(); 88 MediaGalleriesDialogController();
91 89
92 virtual ~MediaGalleriesDialogController(); 90 virtual ~MediaGalleriesDialogController();
93 91
94 private: 92 private:
95 // This type is for media galleries that have been added via "add gallery" 93 // This type is for media galleries that have been added via "add gallery"
96 // button, but have not yet been committed to the prefs system and will be 94 // button, but have not yet been committed to the prefs system and will be
(...skipping 29 matching lines...) Expand all
126 scoped_ptr<MediaGalleriesDialog> dialog_; 124 scoped_ptr<MediaGalleriesDialog> dialog_;
127 125
128 scoped_refptr<ui::SelectFileDialog> select_folder_dialog_; 126 scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
129 127
130 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogController); 128 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogController);
131 }; 129 };
132 130
133 } // namespace chrome 131 } // namespace chrome
134 132
135 #endif // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_ 133 #endif // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698