| Index: remoting/host/disconnect_window_linux.cc
|
| diff --git a/remoting/host/disconnect_window_linux.cc b/remoting/host/disconnect_window_linux.cc
|
| index d9c95b95f2eb8b89cddd818fd2e16ad4ea7c3154..f42fd4377cab44e9f6da7a8ff090a1cb4099fe5b 100644
|
| --- a/remoting/host/disconnect_window_linux.cc
|
| +++ b/remoting/host/disconnect_window_linux.cc
|
| @@ -141,7 +141,7 @@ DisconnectWindowGtk::DisconnectWindowGtk()
|
| }
|
|
|
| DisconnectWindowGtk::~DisconnectWindowGtk() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (disconnect_window_) {
|
| gtk_widget_destroy(disconnect_window_);
|
| @@ -151,7 +151,7 @@ DisconnectWindowGtk::~DisconnectWindowGtk() {
|
|
|
| void DisconnectWindowGtk::Start(
|
| const base::WeakPtr<ClientSessionControl>& client_session_control) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(!client_session_control_.get());
|
| DCHECK(client_session_control.get());
|
| DCHECK(!disconnect_window_);
|
| @@ -254,7 +254,7 @@ void DisconnectWindowGtk::Start(
|
| }
|
|
|
| void DisconnectWindowGtk::OnClicked(GtkButton* button) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (client_session_control_.get())
|
| client_session_control_->DisconnectSession(protocol::OK);
|
| @@ -262,7 +262,7 @@ void DisconnectWindowGtk::OnClicked(GtkButton* button) {
|
|
|
| gboolean DisconnectWindowGtk::OnDelete(GtkWidget* window,
|
| GdkEvent* event) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (client_session_control_.get())
|
| client_session_control_->DisconnectSession(protocol::OK);
|
| @@ -271,7 +271,7 @@ gboolean DisconnectWindowGtk::OnDelete(GtkWidget* window,
|
|
|
| gboolean DisconnectWindowGtk::OnConfigure(GtkWidget* widget,
|
| GdkEventConfigure* event) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| // Only generate bitmaps if the size has actually changed.
|
| if (event->width == current_width_ && event->height == current_height_)
|
| @@ -327,7 +327,7 @@ gboolean DisconnectWindowGtk::OnDraw(GtkWidget* widget, cairo_t* cr) {
|
| #if GTK_MAJOR_VERSION == 2
|
| NOTREACHED();
|
| #endif
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| DrawBackground(cr, current_width_, current_height_);
|
| return FALSE;
|
| @@ -335,7 +335,7 @@ gboolean DisconnectWindowGtk::OnDraw(GtkWidget* widget, cairo_t* cr) {
|
|
|
| gboolean DisconnectWindowGtk::OnButtonPress(GtkWidget* widget,
|
| GdkEventButton* event) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| gtk_window_begin_move_drag(GTK_WINDOW(disconnect_window_),
|
| event->button,
|
|
|