Hook up "clear browsing data" dialog. It looks like ass right now. The intent is to be able to debug problems with NativeControls under Gtk.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/131027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18715 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h
index bfd70ef..ebd532a 100644
--- a/chrome/browser/views/browser_dialogs.h
+++ b/chrome/browser/views/browser_dialogs.h
@@ -38,7 +38,7 @@ void ShowBugReportView(views::Widget* parent,
                        TabContents* tab);
 
 // Shows the "Clear browsing data" dialog box. See ClearBrowsingDataView.
-void ShowClearBrowsingDataView(views::Widget* parent,
+void ShowClearBrowsingDataView(gfx::NativeWindow parent,
                                Profile* profile);
 
 // Shows the "Select profile" dialog. See SelectProfileDialog.
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index f6da40f..9b8cf76 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -29,11 +29,10 @@ static const int kExtraMarginForTimePeriodLabel = 3;
 namespace browser {
 
 // Defined in browser_dialogs.h for creation of the view.
-void ShowClearBrowsingDataView(views::Widget* parent,
+void ShowClearBrowsingDataView(gfx::NativeWindow parent,
                                Profile* profile) {
-  views::Window::CreateChromeWindow(
-      parent->GetNativeView(), gfx::Rect(),
-      new ClearBrowsingDataView(profile))->Show();
+  views::Window::CreateChromeWindow(parent, gfx::Rect(),
+                                    new ClearBrowsingDataView(profile))->Show();
 }
 
 }  // namespace browser
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index f188478..bae65b4 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__
-#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__
+#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
+#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
 
 #include "chrome/browser/browsing_data_remover.h"
 #include "views/controls/button/button.h"
@@ -111,7 +111,7 @@ class ClearBrowsingDataView : public views::View,
   // of deleting itself when done.
   BrowsingDataRemover* remover_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ClearBrowsingDataView);
+  DISALLOW_COPY_AND_ASSIGN(ClearBrowsingDataView);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__
+#endif  // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index b9c8c40..50780f5 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -867,7 +867,8 @@ void BrowserView::ShowReportBugDialog() {
 }
 
 void BrowserView::ShowClearBrowsingDataDialog() {
-  browser::ShowClearBrowsingDataView(GetWidget(), browser_->profile());
+  browser::ShowClearBrowsingDataView(GetWindow()->GetNativeWindow(),
+                                     browser_->profile());
 }
 
 void BrowserView::ShowImportDialog() {