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

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.h

Issue 10826185: Fix crash in WebsiteSettingsPopupView::OnWidgetClosing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/website_settings/website_settings_popup_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 void ResetConnectionSection(views::View* section_container, 109 void ResetConnectionSection(views::View* section_container,
110 const gfx::Image& icon, 110 const gfx::Image& icon,
111 const string16& headline, 111 const string16& headline,
112 const string16& text, 112 const string16& text,
113 views::Link* link); 113 views::Link* link);
114 114
115 // The tab contents of the current tab. The popup can't live longer than a 115 // The tab contents of the current tab. The popup can't live longer than a
116 // tab. 116 // tab.
117 TabContents* tab_contents_; 117 TabContents* tab_contents_;
118 118
119 // The presenter that controlls the Website Settings UI. 119 // The presenter that controlls the Website Settings UI. |presenter_| is null
120 // if the popup is opened for a internal chrome url.
120 scoped_ptr<WebsiteSettings> presenter_; 121 scoped_ptr<WebsiteSettings> presenter_;
121 122
122 PopupHeaderView* header_; // Owned by views hierarchy. 123 PopupHeaderView* header_; // Owned by views hierarchy.
123 124
124 // The |TabbedPane| that contains the tabs of the Website Settings UI. 125 // The |TabbedPane| that contains the tabs of the Website Settings UI.
125 views::TabbedPane* tabbed_pane_; 126 views::TabbedPane* tabbed_pane_;
126 127
127 // The view that contains the contents of the "Cookies and Site data" section 128 // The view that contains the contents of the "Cookies and Site data" section
128 // from the "Permissions" tab. 129 // from the "Permissions" tab.
129 views::View* site_data_content_; 130 views::View* site_data_content_;
(...skipping 14 matching lines...) Expand all
144 // provide a certificate then |cert_id_| is 0. 145 // provide a certificate then |cert_id_| is 0.
145 int cert_id_; 146 int cert_id_;
146 147
147 views::View* connection_info_content_; 148 views::View* connection_info_content_;
148 views::View* page_info_content_; 149 views::View* page_info_content_;
149 150
150 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView); 151 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
151 }; 152 };
152 153
153 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_ H_ 154 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_ H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/website_settings/website_settings_popup_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698