Index: chrome/browser/ui/views/options/cookies_view.cc |
diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc |
index 5079266927ed651a7239a65a80322e922cb62cb1..a94e6dbacfd5fac09ab98b2a9c2e1e4f75484827 100644 |
--- a/chrome/browser/ui/views/options/cookies_view.cc |
+++ b/chrome/browser/ui/views/options/cookies_view.cc |
@@ -21,10 +21,11 @@ |
#include "ui/gfx/canvas.h" |
#include "ui/gfx/color_utils.h" |
#include "views/border.h" |
-#include "views/controls/label.h" |
#include "views/controls/button/native_button.h" |
-#include "views/controls/tree/tree_view.h" |
+#include "views/controls/label.h" |
#include "views/controls/textfield/textfield.h" |
+#include "views/controls/textfield/textfield.h" |
sky
2011/03/09 17:02:33
nuke one of these
tfarina
2011/03/09 17:31:06
Done.
|
+#include "views/controls/tree/tree_view.h" |
#include "views/layout/grid_layout.h" |
#include "views/layout/layout_constants.h" |
@@ -132,7 +133,7 @@ void CookiesView::ButtonPressed( |
} |
/////////////////////////////////////////////////////////////////////////////// |
-// CookiesView, views::Textfield::Controller implementation: |
+// CookiesView, views::TextfieldController implementation: |
void CookiesView::ContentsChanged(views::Textfield* sender, |
const std::wstring& new_contents) { |
@@ -157,6 +158,18 @@ bool CookiesView::HandleKeyEvent(views::Textfield* sender, |
/////////////////////////////////////////////////////////////////////////////// |
// CookiesView, views::DialogDelegate implementation: |
+int CookiesView::GetDialogButtons() const { |
sky
2011/03/09 17:02:33
Did you intend to add these methods?
tfarina
2011/03/09 17:31:06
Yes.
|
+ return MessageBoxFlags::DIALOGBUTTON_CANCEL; |
+} |
+ |
+views::View* CookiesView::GetInitiallyFocusedView() { |
+ return search_field_; |
+} |
+ |
+bool CookiesView::CanResize() const { |
+ return true; |
+} |
+ |
std::wstring CookiesView::GetWindowTitle() const { |
return UTF16ToWide( |
l10n_util::GetStringUTF16(IDS_COOKIES_WEBSITE_PERMISSIONS_WINDOW_TITLE)); |