Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: ui/aura_shell/desktop_background_view.cc

Issue 8194004: change the way windows are parented when their parent is set to NULL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura_shell/aura_shell_main.cc ('k') | ui/aura_shell/desktop_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/desktop_background_view.cc
===================================================================
--- ui/aura_shell/desktop_background_view.cc (revision 104542)
+++ ui/aura_shell/desktop_background_view.cc (working copy)
@@ -8,6 +8,7 @@
#include "grit/ui_resources.h"
#include "ui/aura/desktop.h"
#include "ui/aura_shell/aura_shell_export.h"
+#include "ui/aura_shell/shell_window_ids.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "views/widget/widget.h"
@@ -33,10 +34,11 @@
canvas->TileImageInt(wallpaper_, 0, 0, width(), height());
}
-AURA_SHELL_EXPORT views::Widget* CreateDesktopBackground() {
+views::Widget* CreateDesktopBackground() {
views::Widget* desktop_widget = new views::Widget;
views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
- params.bounds = gfx::Rect(0, 0, 1024, 768);
+ params.parent = aura::Desktop::GetInstance()->window()->GetChildById(
+ aura_shell::internal::kShellWindowId_DesktopBackgroundContainer);
DesktopBackgroundView* view = new DesktopBackgroundView;
params.delegate = view;
desktop_widget->Init(params);
« no previous file with comments | « ui/aura_shell/aura_shell_main.cc ('k') | ui/aura_shell/desktop_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698