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

Side by Side Diff: chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc

Issue 8477042: Move Sad Tab implementation out of the TabContentsViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes for jochen and jam Created 9 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 | 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/ui/virtual_keyboard/virtual_keyboard_manager.h" 5 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/extensions/extension_event_router.h" 9 #include "chrome/browser/extensions/extension_event_router.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 // Overridden from views::Widget. 109 // Overridden from views::Widget.
110 virtual bool OnKeyEvent(const views::KeyEvent& event) OVERRIDE; 110 virtual bool OnKeyEvent(const views::KeyEvent& event) OVERRIDE;
111 111
112 // Overridden from ui::AnimationDelegate. 112 // Overridden from ui::AnimationDelegate.
113 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 113 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
114 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; 114 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
115 115
116 // Overridden from TabContentsObserver. 116 // Overridden from TabContentsObserver.
117 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 117 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
118 virtual void RenderViewGone() OVERRIDE; 118 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
119 void OnRequest(const ExtensionHostMsg_Request_Params& params); 119 void OnRequest(const ExtensionHostMsg_Request_Params& params);
120 120
121 // Overridden from TextInputTypeObserver. 121 // Overridden from TextInputTypeObserver.
122 virtual void TextInputTypeChanged(ui::TextInputType type, 122 virtual void TextInputTypeChanged(ui::TextInputType type,
123 views::Widget *widget) OVERRIDE; 123 views::Widget *widget) OVERRIDE;
124 124
125 // Overridden from ExtensionFunctionDispatcher::Delegate. 125 // Overridden from ExtensionFunctionDispatcher::Delegate.
126 virtual Browser* GetBrowser() OVERRIDE; 126 virtual Browser* GetBrowser() OVERRIDE;
127 virtual gfx::NativeView GetNativeViewOfHost() OVERRIDE; 127 virtual gfx::NativeView GetNativeViewOfHost() OVERRIDE;
128 virtual TabContents* GetAssociatedTabContents() const OVERRIDE; 128 virtual TabContents* GetAssociatedTabContents() const OVERRIDE;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 340
341 bool KeyboardWidget::OnMessageReceived(const IPC::Message& message) { 341 bool KeyboardWidget::OnMessageReceived(const IPC::Message& message) {
342 bool handled = true; 342 bool handled = true;
343 IPC_BEGIN_MESSAGE_MAP(KeyboardWidget, message) 343 IPC_BEGIN_MESSAGE_MAP(KeyboardWidget, message)
344 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) 344 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
345 IPC_MESSAGE_UNHANDLED(handled = false) 345 IPC_MESSAGE_UNHANDLED(handled = false)
346 IPC_END_MESSAGE_MAP() 346 IPC_END_MESSAGE_MAP()
347 return handled; 347 return handled;
348 } 348 }
349 349
350 void KeyboardWidget::RenderViewGone() { 350 void KeyboardWidget::RenderViewGone(base::TerminationStatus status) {
351 // Reload the keyboard if it crashes. 351 // Reload the keyboard if it crashes.
352 dom_view_->LoadURL(keyboard_url_); 352 dom_view_->LoadURL(keyboard_url_);
353 dom_view_->SchedulePaint(); 353 dom_view_->SchedulePaint();
354 } 354 }
355 355
356 void KeyboardWidget::OnRequest(const ExtensionHostMsg_Request_Params& request) { 356 void KeyboardWidget::OnRequest(const ExtensionHostMsg_Request_Params& request) {
357 extension_dispatcher_.Dispatch(request, 357 extension_dispatcher_.Dispatch(request,
358 dom_view_->dom_contents()->tab_contents()->render_view_host()); 358 dom_view_->dom_contents()->tab_contents()->render_view_host());
359 } 359 }
360 360
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 564
565 void VirtualKeyboardManager::OnDesktopBoundsChanged( 565 void VirtualKeyboardManager::OnDesktopBoundsChanged(
566 const gfx::Rect& prev_bounds) { 566 const gfx::Rect& prev_bounds) {
567 keyboard_->ResetBounds(); 567 keyboard_->ResetBounds();
568 } 568 }
569 569
570 // static 570 // static
571 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() { 571 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
572 return Singleton<VirtualKeyboardManager>::get(); 572 return Singleton<VirtualKeyboardManager>::get();
573 } 573 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698