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

Side by Side Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 3201003: Fixed error message bubbles according to the latest mocks (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Comments resolved Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/chromeos/login/screen_locker.h" 5 #include "chrome/browser/chromeos/login/screen_locker.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 CrosLibrary::Get()->GetInputMethodLibrary(); 510 CrosLibrary::Get()->GetInputMethodLibrary();
511 if (input_method_library->GetNumActiveInputMethods() > 1) 511 if (input_method_library->GetNumActiveInputMethods() > 1)
512 msg += L"\n" + l10n_util::GetString(IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT); 512 msg += L"\n" + l10n_util::GetString(IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT);
513 513
514 error_info_ = MessageBubble::ShowNoGrab( 514 error_info_ = MessageBubble::ShowNoGrab(
515 lock_window_, 515 lock_window_,
516 rect, 516 rect,
517 BubbleBorder::BOTTOM_LEFT, 517 BubbleBorder::BOTTOM_LEFT,
518 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING), 518 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
519 msg, 519 msg,
520 std::wstring(), // TODO: add help link
520 this); 521 this);
521 if (mouse_event_relay_.get()) { 522 if (mouse_event_relay_.get()) {
522 MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get()); 523 MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get());
523 } 524 }
524 mouse_event_relay_.reset( 525 mouse_event_relay_.reset(
525 new MouseEventRelay(lock_widget_->GetNativeView()->window, 526 new MouseEventRelay(lock_widget_->GetNativeView()->window,
526 error_info_->GetNativeView()->window)); 527 error_info_->GetNativeView()->window));
527 MessageLoopForUI::current()->AddObserver(mouse_event_relay_.get()); 528 MessageLoopForUI::current()->AddObserver(mouse_event_relay_.get());
528 } 529 }
529 530
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 } 698 }
698 699
699 void ScreenLocker::OnWindowManagerReady() { 700 void ScreenLocker::OnWindowManagerReady() {
700 DLOG(INFO) << "OnClientEvent: drawn for lock"; 701 DLOG(INFO) << "OnClientEvent: drawn for lock";
701 drawn_ = true; 702 drawn_ = true;
702 if (input_grabbed_) 703 if (input_grabbed_)
703 ScreenLockReady(); 704 ScreenLockReady();
704 } 705 }
705 706
706 } // namespace chromeos 707 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.h ('k') | chrome/browser/chromeos/login/user_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698