Index: base/message_loop/message_pump_win.cc |
diff --git a/base/message_pump_win.cc b/base/message_loop/message_pump_win.cc |
similarity index 98% |
rename from base/message_pump_win.cc |
rename to base/message_loop/message_pump_win.cc |
index dcbb3201cd8f57c38d6a3b744727d514559df336..36a321092ff21c2f6be12d7fd36f2653e5ddd025 100644 |
--- a/base/message_pump_win.cc |
+++ b/base/message_loop/message_pump_win.cc |
@@ -2,17 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/message_pump_win.h" |
+#include "base/message_loop/message_pump_win.h" |
#include <math.h> |
#include "base/debug/trace_event.h" |
-#include "base/message_loop.h" |
+#include "base/message_loop/message_loop.h" |
#include "base/metrics/histogram.h" |
#include "base/process_util.h" |
#include "base/stringprintf.h" |
#include "base/win/wrapped_window_proc.h" |
+namespace base { |
+ |
namespace { |
enum MessageLoopProblems { |
@@ -24,8 +26,6 @@ enum MessageLoopProblems { |
} // namespace |
-namespace base { |
- |
static const wchar_t kWndClassFormat[] = L"Chrome_MessagePumpWindow_%p"; |
// Message sent to get an additional time slice for pumping (processing) another |
@@ -105,7 +105,7 @@ MessagePumpForUI::MessagePumpForUI() |
MessagePumpForUI::~MessagePumpForUI() { |
DestroyWindow(message_hwnd_); |
UnregisterClass(MAKEINTATOM(atom_), |
- base::GetModuleFromAddress(&WndProcThunk)); |
+ GetModuleFromAddress(&WndProcThunk)); |
} |
void MessagePumpForUI::ScheduleWork() { |
@@ -271,9 +271,9 @@ void MessagePumpForUI::DoRunLoop() { |
void MessagePumpForUI::InitMessageWnd() { |
// Generate a unique window class name. |
- string16 class_name = base::StringPrintf(kWndClassFormat, this); |
+ string16 class_name = StringPrintf(kWndClassFormat, this); |
- HINSTANCE instance = base::GetModuleFromAddress(&WndProcThunk); |
+ HINSTANCE instance = GetModuleFromAddress(&WndProcThunk); |
WNDCLASSEX wc = {0}; |
wc.cbSize = sizeof(wc); |
wc.lpfnWndProc = base::win::WrappedWindowProc<WndProcThunk>; |