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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 2617883002: Add a new BindInterface() method to Connector. (Closed)
Patch Set: . Created 3 years, 11 months 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver( 290 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
291 this); 291 this);
292 292
293 chromeos::input_method::ImeKeyboard* keyboard = 293 chromeos::input_method::ImeKeyboard* keyboard =
294 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); 294 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
295 if (keyboard) 295 if (keyboard)
296 keyboard->AddObserver(this); 296 keyboard->AddObserver(this);
297 297
298 content::ServiceManagerConnection::GetForProcess() 298 content::ServiceManagerConnection::GetForProcess()
299 ->GetConnector() 299 ->GetConnector()
300 ->ConnectToInterface(ash_util::GetAshServiceName(), 300 ->BindInterface(ash_util::GetAshServiceName(), &touch_view_manager_ptr_);
301 &touch_view_manager_ptr_);
302 touch_view_manager_ptr_->AddObserver( 301 touch_view_manager_ptr_->AddObserver(
303 touch_view_binding_.CreateInterfacePtrAndBind()); 302 touch_view_binding_.CreateInterfacePtrAndBind());
304 } 303 }
305 304
306 SigninScreenHandler::~SigninScreenHandler() { 305 SigninScreenHandler::~SigninScreenHandler() {
307 OobeUI* oobe_ui = GetOobeUI(); 306 OobeUI* oobe_ui = GetOobeUI();
308 if (oobe_ui && oobe_ui_observer_added_) 307 if (oobe_ui && oobe_ui_observer_added_)
309 oobe_ui->RemoveObserver(this); 308 oobe_ui->RemoveObserver(this);
310 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver( 309 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
311 this); 310 this);
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 } 1541 }
1543 1542
1544 void SigninScreenHandler::OnFeedbackFinished() { 1543 void SigninScreenHandler::OnFeedbackFinished() {
1545 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); 1544 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI");
1546 1545
1547 // Recreate user's cryptohome after the feedback is attempted. 1546 // Recreate user's cryptohome after the feedback is attempted.
1548 HandleResyncUserData(); 1547 HandleResyncUserData();
1549 } 1548 }
1550 1549
1551 } // namespace chromeos 1550 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ime_driver/ime_driver_mus.cc ('k') | components/filesystem/files_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698