| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle
r2.h" | 5 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle
r2.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 base::FundamentalValue is_random(true); | 233 base::FundamentalValue is_random(true); |
| 234 web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage", | 234 web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage", |
| 235 image_url, is_random); | 235 image_url, is_random); |
| 236 } | 236 } |
| 237 | 237 |
| 238 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const { | 238 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const { |
| 239 Browser* browser = | 239 Browser* browser = |
| 240 browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui())); | 240 browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui())); |
| 241 if (!browser) | 241 if (!browser) |
| 242 return NULL; | 242 return NULL; |
| 243 return browser->window()->GetNativeHandle(); | 243 return browser->window()->GetNativeWindow(); |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace options2 | 246 } // namespace options2 |
| 247 } // namespace chromeos | 247 } // namespace chromeos |
| OLD | NEW |