diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:10:46 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:10:46 +0000 |
| commit | d8f1004bcf08a2c0d629198a3695808b3a400487 (patch) | |
| tree | 77d0c11dfba7586a6a85347cabb2c3e83d8735ce /content/shell/shell_stacking_client_ash.h | |
| parent | e32934786cf3edc23e2055c7f898d1ef77eced59 (diff) | |
| download | chromium_src-d8f1004bcf08a2c0d629198a3695808b3a400487.zip chromium_src-d8f1004bcf08a2c0d629198a3695808b3a400487.tar.gz chromium_src-d8f1004bcf08a2c0d629198a3695808b3a400487.tar.bz2 | |
re-re-land of https://codereview.chromium.org/11364053/
First attempt here: https://codereview.chromium.org/11364053/ : failed linux_chromeos_asan
Second attempt here: http://codereview.chromium.org/11362216/ : collided with renames in http://crrev.com/167418
This cl is the same as the second attempt, with the namespaces and includes updated for file renames.
TBR=ben@chromium.org
BUG=128578
Review URL: https://chromiumcodereview.appspot.com/11377140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_stacking_client_ash.h')
| -rw-r--r-- | content/shell/shell_stacking_client_ash.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h index d5adbc9..73e420d 100644 --- a/content/shell/shell_stacking_client_ash.h +++ b/content/shell/shell_stacking_client_ash.h @@ -42,7 +42,8 @@ class ShellStackingClientAsh : public aura::client::StackingClient { virtual ~ShellStackingClientAsh(); // Overridden from client::StackingClient: - virtual aura::Window* GetDefaultParent(aura::Window* window, + virtual aura::Window* GetDefaultParent(aura::Window* context, + aura::Window* window, const gfx::Rect& bounds) OVERRIDE; private: |