views: Moves TextfieldController/TextRange into their own headers.

chrome/browser/ui/views/options/cookies_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/options/cookies_view.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/appcache_info_view.h"
 #include "chrome/browser/ui/views/cookie_info_view.h"
 #include "chrome/browser/ui/views/database_info_view.h"
 #include "chrome/browser/ui/views/indexed_db_info_view.h"
 #include "chrome/browser/ui/views/local_storage_info_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cookie_monster.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "views/border.h"
+#include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
-#include "views/controls/button/native_button.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/controls/textfield/textfield.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 
 // static
 views::Window* CookiesView::instance_ = NULL;
 static const int kSearchFilterDelayMs = 500;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTreeView
 //  Overridden to handle Delete key presses
@@ skipping 87 matching lines @@
       UpdateForEmptyState();
   } else if (sender == remove_all_button_) {
     cookies_tree_model_->DeleteAllStoredObjects();
     UpdateForEmptyState();
   } else if (sender == clear_search_button_) {
     ResetSearchQuery();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesView, views::Textfield::Controller implementation:
+// CookiesView, views::TextfieldController implementation:
 
 void CookiesView::ContentsChanged(views::Textfield* sender,
                                   const std::wstring& new_contents) {
   clear_search_button_->SetEnabled(!search_field_->text().empty());
   search_update_factory_.RevokeAll();
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       search_update_factory_.NewRunnableMethod(
           &CookiesView::UpdateSearchResults), kSearchFilterDelayMs);
 }
 
 bool CookiesView::HandleKeyEvent(views::Textfield* sender,
                                  const views::KeyEvent& key_event) {
   if (key_event.key_code() == ui::VKEY_ESCAPE) {
     ResetSearchQuery();
   } else if (key_event.key_code() == ui::VKEY_RETURN) {
     search_update_factory_.RevokeAll();
     UpdateSearchResults();
   }
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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));
 }
 
 void CookiesView::WindowClosing() {
   instance_ = NULL;
 }
 
 views::View* CookiesView::GetContentsView() {
@@ skipping 221 matching lines @@
       GetTotalNodeCount() > 1);
 }
 
 void CookiesView::UpdateVisibleDetailedInfo(views::View* view) {
   cookie_info_view_->SetVisible(view == cookie_info_view_);
   database_info_view_->SetVisible(view == database_info_view_);
   local_storage_info_view_->SetVisible(view == local_storage_info_view_);
   appcache_info_view_->SetVisible(view == appcache_info_view_);
   indexed_db_info_view_->SetVisible(view == indexed_db_info_view_);
 }