diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-26 14:49:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-26 14:49:09 +0000 |
| commit | 32c2a46c5f820f42cdb37b869e99633d8a2d73ad (patch) | |
| tree | 9e09f67ffd197c2067a286e4e45927ee5c5aa429 /ui/aura/test | |
| parent | 08f8feb39b2c8801dd39a1531fb5958644162e6d (diff) | |
| download | chromium_src-32c2a46c5f820f42cdb37b869e99633d8a2d73ad.zip chromium_src-32c2a46c5f820f42cdb37b869e99633d8a2d73ad.tar.gz chromium_src-32c2a46c5f820f42cdb37b869e99633d8a2d73ad.tar.bz2 | |
Migrate client API setters/getters to take a RootWindow.
http://crbug.com/112131
TEST=none
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/9455081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test')
| -rw-r--r-- | ui/aura/test/test_activation_client.cc | 8 | ||||
| -rw-r--r-- | ui/aura/test/test_activation_client.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ui/aura/test/test_activation_client.cc b/ui/aura/test/test_activation_client.cc index a6aef6a..7ba0d41 100644 --- a/ui/aura/test/test_activation_client.cc +++ b/ui/aura/test/test_activation_client.cc @@ -1,9 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "ui/aura/test/test_activation_client.h" +#include "ui/aura/root_window.h" #include "ui/aura/window.h" namespace aura { @@ -12,8 +13,9 @@ namespace test { //////////////////////////////////////////////////////////////////////////////// // TestActivationClient, public: -TestActivationClient::TestActivationClient() : active_window_(NULL) { - client::SetActivationClient(this); +TestActivationClient::TestActivationClient(RootWindow* root_window) + : active_window_(NULL) { + client::SetActivationClient(root_window, this); } TestActivationClient::~TestActivationClient() { diff --git a/ui/aura/test/test_activation_client.h b/ui/aura/test/test_activation_client.h index 8dd7e98b..6221d21 100644 --- a/ui/aura/test/test_activation_client.h +++ b/ui/aura/test/test_activation_client.h @@ -12,12 +12,13 @@ #include "ui/aura/window_observer.h" namespace aura { +class RootWindow; namespace test { class TestActivationClient : public client::ActivationClient, public WindowObserver { public: - TestActivationClient(); + explicit TestActivationClient(RootWindow* root_window); virtual ~TestActivationClient(); // Overridden from client::ActivationClient: |