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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 11466010: Decompose BrowserStateMonitor into two parts, simplifying unit tests and APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gypi ordering. Created 8 years 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/chromeos/input_method/input_method_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index 8a4fa7c61f4235c779c367d55b823427efa12c0d..2f9a67cefe03e4442be9ae450c2978d6c3471daa 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "chrome/browser/chromeos/input_method/browser_state_monitor.h"
#include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
#include "chrome/browser/chromeos/input_method/input_method_delegate.h"
#include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
@@ -83,7 +82,6 @@ void InputMethodManagerImpl::SetState(State new_state) {
break;
case STATE_TERMINATING: {
ibus_controller_->Stop();
- browser_state_monitor_.reset(); // For crbug.com/120183.
if (candidate_window_controller_.get()) {
candidate_window_controller_->Shutdown(ibus_controller_.get());
candidate_window_controller_.reset();
@@ -581,7 +579,6 @@ void InputMethodManagerImpl::OnDisconnected() {
void InputMethodManagerImpl::Init() {
DCHECK(!ibus_controller_.get());
- browser_state_monitor_.reset(new BrowserStateMonitor(this, delegate_.get()));
ibus_controller_.reset(IBusController::Create());
xkeyboard_.reset(XKeyboard::Create(util_));
ibus_controller_->AddObserver(this);

Powered by Google App Engine
This is Rietveld 408576698