| Index: ui/gfx/screen_win.cc
|
| diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc
|
| index d207db0fecb21cda92adfa73251049733848ba3f..845249a335304b023b989636fca219321a00e8af 100644
|
| --- a/ui/gfx/screen_win.cc
|
| +++ b/ui/gfx/screen_win.cc
|
| @@ -146,27 +146,13 @@ void ScreenWin::RemoveObserver(DisplayObserver* observer) {
|
| }
|
|
|
| HWND ScreenWin::GetHWNDFromNativeView(NativeView window) const {
|
| -#if defined(USE_AURA)
|
| NOTREACHED();
|
| return NULL;
|
| -#else
|
| - return window;
|
| -#endif // USE_AURA
|
| }
|
|
|
| NativeWindow ScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {
|
| -#if defined(USE_AURA)
|
| NOTREACHED();
|
| return NULL;
|
| -#else
|
| - return hwnd;
|
| -#endif // USE_AURA
|
| }
|
|
|
| -#if !defined(USE_AURA)
|
| -Screen* CreateNativeScreen() {
|
| - return new ScreenWin;
|
| -}
|
| -#endif // !USE_AURA
|
| -
|
| } // namespace gfx
|
|
|