Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / collected_cookies_views.h

diff --git a/src/chrome/browser/ui/views/collected_cookies_views.h b/src/chrome/browser/ui/views/collected_cookies_views.h
index 5a62fef..07602b5 100644 (file)
--- a/src/chrome/browser/ui/views/collected_cookies_views.h
+++ b/src/chrome/browser/ui/views/collected_cookies_views.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_COLLECTED_COOKIES_VIEWS_H_
 
 #include "base/compiler_specific.h"
-#include "chrome/common/content_settings.h"
+#include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/views/controls/button/button.h"
@@ -49,7 +49,6 @@ class CollectedCookiesViews : public views::DialogDelegateView,
   virtual int GetDialogButtons() const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
-  virtual void DeleteDelegate() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
@@ -64,7 +63,7 @@ class CollectedCookiesViews : public views::DialogDelegateView,
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view) OVERRIDE;
 
   // views::View:
-  virtual gfx::Size GetMinimumSize() OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
 
@@ -93,8 +92,6 @@ class CollectedCookiesViews : public views::DialogDelegateView,
 
   content::NotificationRegistrar registrar_;
 
-  views::Widget* window_;
-
   // The web contents.
   content::WebContents* web_contents_;