OLD | NEW |
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/touch/keyboard/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" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/tabs/tab_strip_model.h" | 13 #include "chrome/browser/tabs/tab_strip_model.h" |
14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
15 #include "chrome/browser/ui/views/dom_view.h" | 15 #include "chrome/browser/ui/views/dom_view.h" |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 void KeyboardWidget::OnWidgetVisibilityChanged(Widget* widget, bool visible) { | 428 void KeyboardWidget::OnWidgetVisibilityChanged(Widget* widget, bool visible) { |
429 if (target_ == widget && !visible) | 429 if (target_ == widget && !visible) |
430 SetTarget(NULL); | 430 SetTarget(NULL); |
431 } | 431 } |
432 | 432 |
433 void KeyboardWidget::OnWidgetActivationChanged(Widget* widget, bool active) { | 433 void KeyboardWidget::OnWidgetActivationChanged(Widget* widget, bool active) { |
434 if (target_ == widget && !active) | 434 if (target_ == widget && !active) |
435 SetTarget(NULL); | 435 SetTarget(NULL); |
436 } | 436 } |
437 | 437 |
438 KeyboardManager::KeyboardManager() | 438 VirtualKeyboardManager::VirtualKeyboardManager() |
439 : keyboard_(new KeyboardWidget()) { | 439 : keyboard_(new KeyboardWidget()) { |
440 keyboard_->AddObserver(this); | 440 keyboard_->AddObserver(this); |
441 | 441 |
442 views::desktop::DesktopWindowView* desktop = | 442 views::desktop::DesktopWindowView* desktop = |
443 views::desktop::DesktopWindowView::desktop_window_view; | 443 views::desktop::DesktopWindowView::desktop_window_view; |
444 | 444 |
445 // We are either not in views desktop mode, or we are and we are not yet | 445 // We are either not in views desktop mode, or we are and we are not yet |
446 // observing the desktop. | 446 // observing the desktop. |
447 DCHECK(!desktop || !desktop->HasObserver(this)); | 447 DCHECK(!desktop || !desktop->HasObserver(this)); |
448 | 448 |
449 if (desktop) | 449 if (desktop) |
450 desktop->AddObserver(this); | 450 desktop->AddObserver(this); |
451 } | 451 } |
452 | 452 |
453 KeyboardManager::~KeyboardManager() { | 453 VirtualKeyboardManager::~VirtualKeyboardManager() { |
454 DCHECK(!keyboard_); | 454 DCHECK(!keyboard_); |
455 | 455 |
456 views::desktop::DesktopWindowView* desktop = | 456 views::desktop::DesktopWindowView* desktop = |
457 views::desktop::DesktopWindowView::desktop_window_view; | 457 views::desktop::DesktopWindowView::desktop_window_view; |
458 | 458 |
459 // We are either not in views desktop mode, or we are and we have been | 459 // We are either not in views desktop mode, or we are and we have been |
460 // observing the desktop | 460 // observing the desktop |
461 DCHECK(!desktop || desktop->HasObserver(this)); | 461 DCHECK(!desktop || desktop->HasObserver(this)); |
462 | 462 |
463 if (desktop) | 463 if (desktop) |
464 desktop->RemoveObserver(this); | 464 desktop->RemoveObserver(this); |
465 } | 465 } |
466 | 466 |
467 void KeyboardManager::ShowKeyboardForWidget(views::Widget* widget) { | 467 void VirtualKeyboardManager::ShowKeyboardForWidget(views::Widget* widget) { |
468 keyboard_->ShowKeyboardForWidget(widget); | 468 keyboard_->ShowKeyboardForWidget(widget); |
469 } | 469 } |
470 | 470 |
471 void KeyboardManager::Hide() { | 471 void VirtualKeyboardManager::Hide() { |
472 keyboard_->Hide(); | 472 keyboard_->Hide(); |
473 } | 473 } |
474 | 474 |
475 views::Widget* KeyboardManager::keyboard() { | 475 views::Widget* VirtualKeyboardManager::keyboard() { |
476 return keyboard_; | 476 return keyboard_; |
477 } | 477 } |
478 | 478 |
479 void KeyboardManager::OnWidgetClosing(views::Widget* widget) { | 479 void VirtualKeyboardManager::OnWidgetClosing(views::Widget* widget) { |
480 DCHECK_EQ(keyboard_, widget); | 480 DCHECK_EQ(keyboard_, widget); |
481 keyboard_ = NULL; | 481 keyboard_ = NULL; |
482 } | 482 } |
483 | 483 |
484 void KeyboardManager::OnDesktopBoundsChanged(const gfx::Rect& prev_bounds) { | 484 void VirtualKeyboardManager::OnDesktopBoundsChanged( |
| 485 const gfx::Rect& prev_bounds) { |
485 keyboard_->ResetBounds(); | 486 keyboard_->ResetBounds(); |
486 } | 487 } |
487 | 488 |
488 // static | 489 // static |
489 KeyboardManager* KeyboardManager::GetInstance() { | 490 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() { |
490 return Singleton<KeyboardManager>::get(); | 491 return Singleton<VirtualKeyboardManager>::get(); |
491 } | 492 } |
OLD | NEW |