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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.h

Issue 11235023: Redesign: Remove TsfEventRouter interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@ominifix
Patch Set: Address comments Created 8 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 25 matching lines...) Expand all
36 // Provides the implementation of an edit control with a drop-down 36 // Provides the implementation of an edit control with a drop-down
37 // autocomplete box. The box itself is implemented in autocomplete_popup.cc 37 // autocomplete box. The box itself is implemented in autocomplete_popup.cc
38 // This file implements the edit box and management for the popup. 38 // This file implements the edit box and management for the popup.
39 class OmniboxViewWin 39 class OmniboxViewWin
40 : public CWindowImpl<OmniboxViewWin, 40 : public CWindowImpl<OmniboxViewWin,
41 CRichEditCtrl, 41 CRichEditCtrl,
42 CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | 42 CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL |
43 ES_NOHIDESEL> >, 43 ES_NOHIDESEL> >,
44 public CRichEditCommands<OmniboxViewWin>, 44 public CRichEditCommands<OmniboxViewWin>,
45 public ui::SimpleMenuModel::Delegate, 45 public ui::SimpleMenuModel::Delegate,
46 public ui::TsfEventRouter::Observer, 46 public ui::TsfEventRouterObserver,
47 public OmniboxView { 47 public OmniboxView {
48 public: 48 public:
49 struct State { 49 struct State {
50 State(const CHARRANGE& selection, 50 State(const CHARRANGE& selection,
51 const CHARRANGE& saved_selection_for_focus_change) 51 const CHARRANGE& saved_selection_for_focus_change)
52 : selection(selection), 52 : selection(selection),
53 saved_selection_for_focus_change(saved_selection_for_focus_change) { 53 saved_selection_for_focus_change(saved_selection_for_focus_change) {
54 } 54 }
55 55
56 const CHARRANGE selection; 56 const CHARRANGE selection;
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // stricken-out when displaying an insecure scheme. 511 // stricken-out when displaying an insecure scheme.
512 url_parse::Component insecure_scheme_component_; 512 url_parse::Component insecure_scheme_component_;
513 513
514 // Instance of accessibility information and handling. 514 // Instance of accessibility information and handling.
515 mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_; 515 mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_;
516 516
517 // The native view host. 517 // The native view host.
518 views::NativeViewHost* native_view_host_; 518 views::NativeViewHost* native_view_host_;
519 519
520 // TSF related event router. 520 // TSF related event router.
521 scoped_refptr<ui::TsfEventRouter> tsf_event_router_; 521 scoped_ptr<ui::TsfEventRouter> tsf_event_router_;
522 522
523 DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin); 523 DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
524 }; 524 };
525 525
526 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 526 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698