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

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

Issue 8633021: Don't reload the keyboard on clean exit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser_process.h"
sadrul 2011/11/22 20:22:18 Probably don't need this include.
9 #include "chrome/browser/extensions/extension_event_router.h" 10 #include "chrome/browser/extensions/extension_event_router.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 11 #include "chrome/browser/extensions/extension_function_dispatcher.h"
11 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/tabs/tab_strip_model.h" 14 #include "chrome/browser/tabs/tab_strip_model.h"
14 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
17 #include "chrome/browser/ui/views/dom_view.h" 18 #include "chrome/browser/ui/views/dom_view.h"
18 #include "chrome/browser/ui/views/frame/browser_view.h" 19 #include "chrome/browser/ui/views/frame/browser_view.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 bool KeyboardWidget::OnMessageReceived(const IPC::Message& message) { 342 bool KeyboardWidget::OnMessageReceived(const IPC::Message& message) {
342 bool handled = true; 343 bool handled = true;
343 IPC_BEGIN_MESSAGE_MAP(KeyboardWidget, message) 344 IPC_BEGIN_MESSAGE_MAP(KeyboardWidget, message)
344 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) 345 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
345 IPC_MESSAGE_UNHANDLED(handled = false) 346 IPC_MESSAGE_UNHANDLED(handled = false)
346 IPC_END_MESSAGE_MAP() 347 IPC_END_MESSAGE_MAP()
347 return handled; 348 return handled;
348 } 349 }
349 350
350 void KeyboardWidget::RenderViewGone(base::TerminationStatus status) { 351 void KeyboardWidget::RenderViewGone(base::TerminationStatus status) {
351 // Reload the keyboard if it crashes. 352 if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
352 dom_view_->LoadURL(keyboard_url_); 353 // Reload the keyboard if it crashes.
353 dom_view_->SchedulePaint(); 354 dom_view_->LoadURL(keyboard_url_);
355 dom_view_->SchedulePaint();
356 }
354 } 357 }
355 358
356 void KeyboardWidget::OnRequest(const ExtensionHostMsg_Request_Params& request) { 359 void KeyboardWidget::OnRequest(const ExtensionHostMsg_Request_Params& request) {
357 extension_dispatcher_.Dispatch(request, 360 extension_dispatcher_.Dispatch(request,
358 dom_view_->dom_contents()->tab_contents()->render_view_host()); 361 dom_view_->dom_contents()->tab_contents()->render_view_host());
359 } 362 }
360 363
361 void KeyboardWidget::TextInputTypeChanged(ui::TextInputType type, 364 void KeyboardWidget::TextInputTypeChanged(ui::TextInputType type,
362 views::Widget *widget) { 365 views::Widget *widget) {
363 // Send onTextInputTypeChanged event to keyboard extension. 366 // Send onTextInputTypeChanged event to keyboard extension.
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 567
565 void VirtualKeyboardManager::OnDesktopBoundsChanged( 568 void VirtualKeyboardManager::OnDesktopBoundsChanged(
566 const gfx::Rect& prev_bounds) { 569 const gfx::Rect& prev_bounds) {
567 keyboard_->ResetBounds(); 570 keyboard_->ResetBounds();
568 } 571 }
569 572
570 // static 573 // static
571 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() { 574 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
572 return Singleton<VirtualKeyboardManager>::get(); 575 return Singleton<VirtualKeyboardManager>::get();
573 } 576 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698