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

Side by Side Diff: chrome/browser/ui/views/collected_cookies_views.cc

Issue 11192014: Revert 162252 - Make Web Intents picker in Views conform to latest mocks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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) 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 #include "chrome/browser/ui/views/collected_cookies_views.h" 5 #include "chrome/browser/ui/views/collected_cookies_views.h"
6 6
7 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" 7 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
8 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 8 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
9 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 9 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
10 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" 10 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 block_allowed_button_(NULL), 192 block_allowed_button_(NULL),
193 allow_blocked_button_(NULL), 193 allow_blocked_button_(NULL),
194 for_session_blocked_button_(NULL), 194 for_session_blocked_button_(NULL),
195 cookie_info_view_(NULL), 195 cookie_info_view_(NULL),
196 infobar_(NULL), 196 infobar_(NULL),
197 status_changed_(false) { 197 status_changed_(false) {
198 TabSpecificContentSettings* content_settings = 198 TabSpecificContentSettings* content_settings =
199 TabSpecificContentSettings::FromWebContents(web_contents); 199 TabSpecificContentSettings::FromWebContents(web_contents);
200 registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, 200 registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
201 content::Source<TabSpecificContentSettings>(content_settings)); 201 content::Source<TabSpecificContentSettings>(content_settings));
202 window_ = new ConstrainedWindowViews( 202 window_ = new ConstrainedWindowViews(web_contents, this, false);
203 web_contents, this, false, ConstrainedWindowViews::DEFAULT_INSETS);
204 } 203 }
205 204
206 /////////////////////////////////////////////////////////////////////////////// 205 ///////////////////////////////////////////////////////////////////////////////
207 // CollectedCookiesViews, views::DialogDelegate implementation: 206 // CollectedCookiesViews, views::DialogDelegate implementation:
208 207
209 string16 CollectedCookiesViews::GetWindowTitle() const { 208 string16 CollectedCookiesViews::GetWindowTitle() const {
210 return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_DIALOG_TITLE); 209 return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_DIALOG_TITLE);
211 } 210 }
212 211
213 int CollectedCookiesViews::GetDialogButtons() const { 212 int CollectedCookiesViews::GetDialogButtons() const {
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 /////////////////////////////////////////////////////////////////////////////// 520 ///////////////////////////////////////////////////////////////////////////////
522 // CollectedCookiesViews, content::NotificationObserver implementation: 521 // CollectedCookiesViews, content::NotificationObserver implementation:
523 522
524 void CollectedCookiesViews::Observe( 523 void CollectedCookiesViews::Observe(
525 int type, 524 int type,
526 const content::NotificationSource& source, 525 const content::NotificationSource& source,
527 const content::NotificationDetails& details) { 526 const content::NotificationDetails& details) {
528 DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN); 527 DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN);
529 window_->CloseConstrainedWindow(); 528 window_->CloseConstrainedWindow();
530 } 529 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_model.cc ('k') | chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698