Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: chrome/browser/autocomplete/autocomplete_edit_view_views.cc

Issue 6628037: views: Moves TextfieldController/TextRange into their own headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h" 5 #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/autocomplete/autocomplete_edit.h" 11 #include "chrome/browser/autocomplete/autocomplete_edit.h"
12 #include "chrome/browser/autocomplete/autocomplete_match.h" 12 #include "chrome/browser/autocomplete/autocomplete_match.h"
13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
14 #include "chrome/browser/command_updater.h" 14 #include "chrome/browser/command_updater.h"
15 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h" 15 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h"
16 #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents _view.h" 16 #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents _view.h"
17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
18 #include "content/browser/tab_contents/tab_contents.h" 18 #include "content/browser/tab_contents/tab_contents.h"
19 #include "content/common/notification_service.h" 19 #include "content/common/notification_service.h"
20 #include "googleurl/src/gurl.h" 20 #include "googleurl/src/gurl.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "net/base/escape.h" 22 #include "net/base/escape.h"
23 #include "ui/base/dragdrop/drag_drop_types.h" 23 #include "ui/base/dragdrop/drag_drop_types.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/gfx/font.h" 25 #include "ui/gfx/font.h"
26 #include "views/border.h" 26 #include "views/border.h"
27 #include "views/controls/textfield/textfield.h"
27 #include "views/layout/fill_layout.h" 28 #include "views/layout/fill_layout.h"
28 29
29 namespace { 30 namespace {
30 31
31 // Textfield for autocomplete that intercepts events that are necessary 32 // Textfield for autocomplete that intercepts events that are necessary
32 // for AutocompleteEditViewViews. 33 // for AutocompleteEditViewViews.
33 class AutocompleteTextfield : public views::Textfield { 34 class AutocompleteTextfield : public views::Textfield {
34 public: 35 public:
35 explicit AutocompleteTextfield( 36 explicit AutocompleteTextfield(
36 AutocompleteEditViewViews* autocomplete_edit_view) 37 AutocompleteEditViewViews* autocomplete_edit_view)
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 // AutocompleteEditViewViews, NotificationObserver implementation: 568 // AutocompleteEditViewViews, NotificationObserver implementation:
568 569
569 void AutocompleteEditViewViews::Observe(NotificationType type, 570 void AutocompleteEditViewViews::Observe(NotificationType type,
570 const NotificationSource& source, 571 const NotificationSource& source,
571 const NotificationDetails& details) { 572 const NotificationDetails& details) {
572 DCHECK(type == NotificationType::BROWSER_THEME_CHANGED); 573 DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
573 SetBaseColor(); 574 SetBaseColor();
574 } 575 }
575 576
576 //////////////////////////////////////////////////////////////////////////////// 577 ////////////////////////////////////////////////////////////////////////////////
577 // AutocompleteEditViewViews, Textfield::Controller implementation: 578 // AutocompleteEditViewViews, views::TextfieldController implementation:
578 579
579 void AutocompleteEditViewViews::ContentsChanged(views::Textfield* sender, 580 void AutocompleteEditViewViews::ContentsChanged(views::Textfield* sender,
580 const string16& new_contents) { 581 const string16& new_contents) {
581 if (handling_key_press_) 582 if (handling_key_press_)
582 content_maybe_changed_by_key_press_ = true; 583 content_maybe_changed_by_key_press_ = true;
583 } 584 }
584 585
585 bool AutocompleteEditViewViews::HandleKeyEvent( 586 bool AutocompleteEditViewViews::HandleKeyEvent(
586 views::Textfield* textfield, 587 views::Textfield* textfield,
587 const views::KeyEvent& event) { 588 const views::KeyEvent& event) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 AutocompletePopupView* AutocompleteEditViewViews::CreatePopupView( 650 AutocompletePopupView* AutocompleteEditViewViews::CreatePopupView(
650 Profile* profile, 651 Profile* profile,
651 const View* location_bar) { 652 const View* location_bar) {
652 #if defined(TOUCH_UI) 653 #if defined(TOUCH_UI)
653 return new TouchAutocompletePopupContentsView( 654 return new TouchAutocompletePopupContentsView(
654 #else 655 #else
655 return new AutocompletePopupContentsView( 656 return new AutocompletePopupContentsView(
656 #endif 657 #endif
657 gfx::Font(), this, model_.get(), profile, location_bar); 658 gfx::Font(), this, model_.get(), profile, location_bar);
658 } 659 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_views.h ('k') | chrome/browser/chromeos/login/captcha_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698