diff options
author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 14:51:13 +0000 |
---|---|---|
committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 14:51:13 +0000 |
commit | fcc14ebb00af0b573377a0864933481cb6f15a84 (patch) | |
tree | 0ea9e9dfb21d23c974602b07d7aaf54f55c37e7f | |
parent | cbe4af5db7454c636f54f0cb09a2c7fefa0ddf09 (diff) | |
download | chromium_src-fcc14ebb00af0b573377a0864933481cb6f15a84.zip chromium_src-fcc14ebb00af0b573377a0864933481cb6f15a84.tar.gz chromium_src-fcc14ebb00af0b573377a0864933481cb6f15a84.tar.bz2 |
Remove NOTIFICATION_EDITABLE_ELEMENT_TOUCHD and stop handling it.
NOTIFICATION_EDITABLE_ELEMENT_TOUCHD is not sent properly on web content area.
In order to avoid bugs for this notification, I remove it for now.
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/7903007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101293 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/ui/touch/keyboard/keyboard_manager.cc | 12 | ||||
-rw-r--r-- | chrome/browser/ui/views/frame/browser_root_view.cc | 22 | ||||
-rw-r--r-- | chrome/browser/ui/views/frame/browser_root_view.h | 6 | ||||
-rw-r--r-- | chrome/common/chrome_notification_types.h | 4 |
4 files changed, 0 insertions, 44 deletions
diff --git a/chrome/browser/ui/touch/keyboard/keyboard_manager.cc b/chrome/browser/ui/touch/keyboard/keyboard_manager.cc index 0f8b3c4..b24a531 100644 --- a/chrome/browser/ui/touch/keyboard/keyboard_manager.cc +++ b/chrome/browser/ui/touch/keyboard/keyboard_manager.cc @@ -187,9 +187,6 @@ KeyboardWidget::KeyboardWidget() chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED, NotificationService::AllSources()); registrar_.Add(this, - chrome::NOTIFICATION_EDITABLE_ELEMENT_TOUCHED, - NotificationService::AllSources()); - registrar_.Add(this, content::NOTIFICATION_APP_EXITING, NotificationService::AllSources()); @@ -404,15 +401,6 @@ void KeyboardWidget::Observe(int type, break; } - case chrome::NOTIFICATION_EDITABLE_ELEMENT_TOUCHED: { - // In case the keyboard hid itself and the focus is still in an editable - // field, and the user touches the field, then we want to show the - // keyboard again. - views::View* src = Source<views::View>(source).ptr(); - ShowKeyboardForWidget(src->GetWidget()); - break; - } - case content::NOTIFICATION_APP_EXITING: { CloseNow(); break; diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index fa2b9f1..75c8616 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -35,28 +35,6 @@ BrowserRootView::BrowserRootView(BrowserView* browser_view, browser_view_(browser_view), forwarding_to_tab_strip_(false) { } -#if defined(TOUCH_UI) -ui::TouchStatus BrowserRootView::OnTouchEvent(const views::TouchEvent& event) { - const ui::TouchStatus status = views::internal::RootView::OnTouchEvent(event); - - if (event.type() != ui::ET_TOUCH_PRESSED) - return status; - - views::InputMethod* input_method = GetInputMethod(); - if (!input_method) - return status; - - ui::TextInputType text_input_type = input_method->GetTextInputType(); - if (text_input_type != ui::TEXT_INPUT_TYPE_NONE) { - NotificationService::current()->Notify( - chrome::NOTIFICATION_EDITABLE_ELEMENT_TOUCHED, - Source<View>(this), - Details<ui::TextInputType>(&text_input_type)); - } - return status; -} -#endif - bool BrowserRootView::GetDropFormats( int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { diff --git a/chrome/browser/ui/views/frame/browser_root_view.h b/chrome/browser/ui/views/frame/browser_root_view.h index 46382a0..c1f3d77 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h @@ -13,9 +13,6 @@ class BrowserView; namespace ui { class OSExchangeData; -#if defined(TOUCH_UI) -enum TouchStatus; -#endif } // RootView implementation used by BrowserFrame. This forwards drop events to @@ -32,9 +29,6 @@ class BrowserRootView : public views::internal::RootView { BrowserRootView(BrowserView* browser_view, views::Widget* widget); // Overridden from views::View: -#if defined(TOUCH_UI) - virtual ui::TouchStatus OnTouchEvent(const views::TouchEvent& event) OVERRIDE; -#endif virtual bool GetDropFormats( int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; diff --git a/chrome/common/chrome_notification_types.h b/chrome/common/chrome_notification_types.h index bdecc9b..2c2487d 100644 --- a/chrome/common/chrome_notification_types.h +++ b/chrome/common/chrome_notification_types.h @@ -874,10 +874,6 @@ enum NotificationType { // Sent when an API for set height of the keyboard is invoked from // JavaScript code. NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED, - - // Sent when an editable element is touched, such as text box, password - // field, and omnibox. - NOTIFICATION_EDITABLE_ELEMENT_TOUCHED, #endif // Protocol Handler Registry ----------------------------------------------- |