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

Side by Side Diff: chrome/browser/views/clear_browsing_data.cc

Issue 201080: [Windows] Clear Browsing Data dialog should not have any button as default action. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « chrome/browser/views/clear_browsing_data.h ('k') | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/clear_browsing_data.h" 5 #include "chrome/browser/views/clear_browsing_data.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "chrome/browser/profile.h" 8 #include "chrome/browser/profile.h"
9 #include "chrome/browser/search_engines/template_url_model.h" 9 #include "chrome/browser/search_engines/template_url_model.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 } else { 237 } else {
238 parent->RemoveChildView(&status_label_); 238 parent->RemoveChildView(&status_label_);
239 parent->RemoveChildView(throbber_.get()); 239 parent->RemoveChildView(throbber_.get());
240 } 240 }
241 } 241 }
242 } 242 }
243 243
244 //////////////////////////////////////////////////////////////////////////////// 244 ////////////////////////////////////////////////////////////////////////////////
245 // ClearBrowsingDataView, views::DialogDelegate implementation: 245 // ClearBrowsingDataView, views::DialogDelegate implementation:
246 246
247 int ClearBrowsingDataView::GetDefaultDialogButton() const {
248 return MessageBoxFlags::DIALOGBUTTON_NONE;
249 }
250
247 std::wstring ClearBrowsingDataView::GetDialogButtonLabel( 251 std::wstring ClearBrowsingDataView::GetDialogButtonLabel(
248 MessageBoxFlags::DialogButton button) const { 252 MessageBoxFlags::DialogButton button) const {
249 if (button == MessageBoxFlags::DIALOGBUTTON_OK) { 253 if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
250 return l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_COMMIT); 254 return l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_COMMIT);
251 } else if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) { 255 } else if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) {
252 return l10n_util::GetString(IDS_CLOSE); 256 return l10n_util::GetString(IDS_CLOSE);
253 } else { 257 } else {
254 return std::wstring(); 258 return std::wstring();
255 } 259 }
256 } 260 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 remover_->AddObserver(this); 436 remover_->AddObserver(this);
433 remover_->Remove(remove_mask); 437 remover_->Remove(remove_mask);
434 } 438 }
435 439
436 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() { 440 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
437 // No need to remove ourselves as an observer as BrowsingDataRemover deletes 441 // No need to remove ourselves as an observer as BrowsingDataRemover deletes
438 // itself after we return. 442 // itself after we return.
439 remover_ = NULL; 443 remover_ = NULL;
440 window()->Close(); 444 window()->Close();
441 } 445 }
OLDNEW
« no previous file with comments | « chrome/browser/views/clear_browsing_data.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698