diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 00:12:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 00:12:39 +0000 |
| commit | 7b0f750bf7b0ccd2f0962817bab1460342d113e9 (patch) | |
| tree | 89809ac408028af8ecff717caf7673e33bdd0dc7 /ash/touch | |
| parent | 7208e05ab641d7dbc83bfc2bf202d2ece0445a74 (diff) | |
| download | chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.zip chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.tar.gz chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.tar.bz2 | |
Change GetContainer to take a root window
Update the use of GetContainer to use the correct root window.
BUG=123160
TEST=no functional change. all tests must pass.
Review URL: https://chromiumcodereview.appspot.com/10540076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index b7773a5..2b976d2 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -137,7 +137,8 @@ TouchObserverHUD::TouchObserverHUD() { params.can_activate = false; params.accept_events = false; params.bounds = gfx::Rect(content->GetPreferredSize()); - params.parent = Shell::GetInstance()->GetContainer( + params.parent = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), internal::kShellWindowId_OverlayContainer); widget_->Init(params); widget_->SetContentsView(content); |