summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorraz@chromium.org <raz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-15 22:38:50 +0000
committerraz@chromium.org <raz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-15 22:38:50 +0000
commitb371c4219b28fdb7ce610041a558048d8325b3c7 (patch)
tree07e9101672472f5c6f6ae49a097c11d097b10ae1
parent6f064c88f49c5ce3bdad58467b17ff1cecb362b4 (diff)
downloadchromium_src-b371c4219b28fdb7ce610041a558048d8325b3c7.zip
chromium_src-b371c4219b28fdb7ce610041a558048d8325b3c7.tar.gz
chromium_src-b371c4219b28fdb7ce610041a558048d8325b3c7.tar.bz2
Merge 62810 - Revert the Clear UI tab per final UI decision, will be implemented elswhere
BUG=59368 TEST=Tabbed ui for clearing private data UI gone Review URL: http://codereview.chromium.org/3819004 TBR=raz@chromium.org Review URL: http://codereview.chromium.org/3761012 git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@62816 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/options/advanced_contents_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index ab8f856..a64ead8 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -41,7 +41,7 @@
#include "chrome/browser/shell_dialogs.h"
#include "chrome/browser/show_options_url.h"
#include "chrome/browser/views/browser_dialogs.h"
-#include "chrome/browser/views/clear_data_view.h"
+#include "chrome/browser/views/clear_browsing_data.h"
#include "chrome/browser/views/list_background.h"
#include "chrome/browser/views/options/content_settings_window_view.h"
#include "chrome/browser/views/options/fonts_languages_window_view.h"
@@ -538,7 +538,7 @@ void PrivacySection::ButtonPressed(
views::Window::CreateChromeWindow(
GetWindow()->GetNativeWindow(),
gfx::Rect(),
- new ClearDataView(profile()))->Show();
+ new ClearBrowsingDataView(profile()))->Show();
}
}