| Index: base/message_pump_glib.cc
|
| ===================================================================
|
| --- base/message_pump_glib.cc (revision 70328)
|
| +++ base/message_pump_glib.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2008 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -12,7 +12,7 @@
|
|
|
| #include "base/eintr_wrapper.h"
|
| #include "base/logging.h"
|
| -#include "base/platform_thread.h"
|
| +#include "base/threading/platform_thread.h"
|
|
|
| namespace {
|
|
|
| @@ -177,8 +177,8 @@
|
| #ifndef NDEBUG
|
| // Make sure we only run this on one thread. GTK only has one message pump
|
| // so we can only have one UI loop per process.
|
| - static PlatformThreadId thread_id = PlatformThread::CurrentId();
|
| - DCHECK(thread_id == PlatformThread::CurrentId()) <<
|
| + static base::PlatformThreadId thread_id = base::PlatformThread::CurrentId();
|
| + DCHECK(thread_id == base::PlatformThread::CurrentId()) <<
|
| "Running MessagePumpForUI on two different threads; "
|
| "this is unsupported by GLib!";
|
| #endif
|
|
|