| Index: trunk/src/ui/views/widget/native_widget_aura.cc
|
| ===================================================================
|
| --- trunk/src/ui/views/widget/native_widget_aura.cc (revision 236092)
|
| +++ trunk/src/ui/views/widget/native_widget_aura.cc (working copy)
|
| @@ -674,7 +674,7 @@
|
|
|
| ui::NativeTheme* NativeWidgetAura::GetNativeTheme() const {
|
| #if !defined(OS_CHROMEOS)
|
| - return DesktopWindowTreeHost::GetNativeTheme(window_);
|
| + return DesktopRootWindowHost::GetNativeTheme(window_);
|
| #else
|
| return ui::NativeThemeAura::instance();
|
| #endif
|
| @@ -990,7 +990,7 @@
|
| #if defined(OS_WIN)
|
| BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
|
| aura::Window* root_window =
|
| - DesktopWindowTreeHostWin::GetContentWindowForHWND(hwnd);
|
| + DesktopRootWindowHostWin::GetContentWindowForHWND(hwnd);
|
| CloseWindow(root_window);
|
| return TRUE;
|
| }
|
| @@ -1005,9 +1005,9 @@
|
|
|
| #if defined(USE_X11) && !defined(OS_CHROMEOS)
|
| std::vector<aura::Window*> open_windows =
|
| - DesktopWindowTreeHostX11::GetAllOpenWindows();
|
| + DesktopRootWindowHostX11::GetAllOpenWindows();
|
| std::for_each(open_windows.begin(), open_windows.end(), CloseWindow);
|
| - DesktopWindowTreeHostX11::CleanUpWindowList();
|
| + DesktopRootWindowHostX11::CleanUpWindowList();
|
| #endif
|
| }
|
|
|
|
|