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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.cc

Issue 11235023: Redesign: Remove TsfEventRouter interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@ominifix
Patch Set: Use ATL for COM object management Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index 299c08f6f883f7d4c3bca327ef8558c49235f828..a632216da33e9094dd5331e237b040fad633e1d0 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -480,7 +480,9 @@ OmniboxViewWin::OmniboxViewWin(OmniboxEditController* controller,
chrome::search::IsInstantExtendedAPIEnabled(parent_view_->profile()),
ToolbarModel::NONE, LocationBarView::BACKGROUND))),
security_level_(ToolbarModel::NONE),
- text_object_model_(NULL) {
+ text_object_model_(NULL),
+ tsf_event_router_(base::win::IsTsfAwareRequired()
+ ? new ui::TsfEventRouter() : NULL) {
Peter Kasting 2012/10/24 20:48:11 Nit: '?' goes on previous line
Seigo Nonaka 2012/10/25 14:37:16 Done.
if (!loaded_library_module_)
loaded_library_module_ = LoadLibrary(kRichEditDLLName);
@@ -541,9 +543,6 @@ OmniboxViewWin::OmniboxViewWin(OmniboxEditController* controller,
// the edit control will invoke RevokeDragDrop when it's being destroyed, so
// we don't have to do so.
scoped_refptr<EditDropTarget> drop_target(new EditDropTarget(this));
-
- if (base::win::IsTsfAwareRequired())
- tsf_event_router_ = ui::TsfEventRouter::Create();
}
}

Powered by Google App Engine
This is Rietveld 408576698