| Index: chrome/browser/media_gallery/media_device_notification_window_win.h
|
| diff --git a/content/browser/system_message_window_win.h b/chrome/browser/media_gallery/media_device_notification_window_win.h
|
| similarity index 60%
|
| copy from content/browser/system_message_window_win.h
|
| copy to chrome/browser/media_gallery/media_device_notification_window_win.h
|
| index a44b1fa587306272c9a2870b91ca89475bb3732c..19f666d2848acbe3b693533e2d7022ac24092e8f 100644
|
| --- a/content/browser/system_message_window_win.h
|
| +++ b/chrome/browser/media_gallery/media_device_notification_window_win.h
|
| @@ -2,27 +2,27 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_SYSTEM_MESSAGE_WINDOW_WIN_H_
|
| -#define CONTENT_BROWSER_SYSTEM_MESSAGE_WINDOW_WIN_H_
|
| +#ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATION_WINDOW_WIN_H_
|
| +#define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATION_WINDOW_WIN_H_
|
| #pragma once
|
|
|
| #include <windows.h>
|
|
|
| #include "base/basictypes.h"
|
| -#include "content/common/content_export.h"
|
|
|
| typedef LRESULT (*VolumeNameFunc)(LPCWSTR drive,
|
| LPWSTR volume_name,
|
| unsigned int volume_name_len);
|
| +namespace chrome {
|
|
|
| -class CONTENT_EXPORT SystemMessageWindowWin {
|
| +class MediaDeviceNotificationWindowWin {
|
| public:
|
| - SystemMessageWindowWin();
|
| + MediaDeviceNotificationWindowWin();
|
| // Only for use in unit tests.
|
| - explicit SystemMessageWindowWin::SystemMessageWindowWin(
|
| + explicit MediaDeviceNotificationWindowWin::MediaDeviceNotificationWindowWin(
|
| VolumeNameFunc volumeNameFunc);
|
|
|
| - virtual ~SystemMessageWindowWin();
|
| + virtual ~MediaDeviceNotificationWindowWin();
|
|
|
| virtual LRESULT OnDeviceChange(UINT event_type, DWORD data);
|
|
|
| @@ -36,8 +36,9 @@ class CONTENT_EXPORT SystemMessageWindowWin {
|
| UINT message,
|
| WPARAM wparam,
|
| LPARAM lparam) {
|
| - SystemMessageWindowWin* msg_wnd = reinterpret_cast<SystemMessageWindowWin*>(
|
| - GetWindowLongPtr(hwnd, GWLP_USERDATA));
|
| + MediaDeviceNotificationWindowWin* msg_wnd =
|
| + reinterpret_cast<MediaDeviceNotificationWindowWin*>(
|
| + GetWindowLongPtr(hwnd, GWLP_USERDATA));
|
| if (msg_wnd)
|
| return msg_wnd->WndProc(hwnd, message, wparam, lparam);
|
| return ::DefWindowProc(hwnd, message, wparam, lparam);
|
| @@ -46,7 +47,9 @@ class CONTENT_EXPORT SystemMessageWindowWin {
|
| HWND window_;
|
| VolumeNameFunc volume_name_func_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(SystemMessageWindowWin);
|
| + DISALLOW_COPY_AND_ASSIGN(MediaDeviceNotificationWindowWin);
|
| };
|
|
|
| -#endif // CONTENT_BROWSER_SYSTEM_MESSAGE_WINDOW_WIN_H_
|
| +} // namespace chrome
|
| +
|
| +#endif // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATION_WINDOW_WIN_H_
|
|
|