diff options
| author | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-11 00:29:18 +0000 |
|---|---|---|
| committer | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-11 00:29:18 +0000 |
| commit | 36e4151d009b1ae6274f5af9449e49f3b6e2198f (patch) | |
| tree | be96c516fc90ce183cc1671bd670e35dc89ccb42 /ash/wm/workspace_controller.h | |
| parent | 557d199404f668006ab48a4ecc1f8e7f3cc2d2ed (diff) | |
| download | chromium_src-36e4151d009b1ae6274f5af9449e49f3b6e2198f.zip chromium_src-36e4151d009b1ae6274f5af9449e49f3b6e2198f.tar.gz chromium_src-36e4151d009b1ae6274f5af9449e49f3b6e2198f.tar.bz2 | |
aura::Window only supports void* and int values for custom properties, which must be cast to and from the correct type at each use point. This CL introduces typed properties and templated aura::Window::[GS]etProperty methods that enforce the use of the declared type. Only pointer types and integral types that fits in intptr_t are supported, and ownership behavior is the same as before. This CL also adds support for default property values other than NULL/0.
BUG=none
TEST=updated unit tests
Review URL: http://codereview.chromium.org/8533025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller.h')
| -rw-r--r-- | ash/wm/workspace_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h index b6998c5..7ea212b 100644 --- a/ash/wm/workspace_controller.h +++ b/ash/wm/workspace_controller.h @@ -60,8 +60,8 @@ class ASH_EXPORT WorkspaceController : // aura::WindowObserver overrides: virtual void OnWindowPropertyChanged(aura::Window* window, - const char* key, - void* old) OVERRIDE; + const void* key, + intptr_t old) OVERRIDE; // ui::SimpleMenuModel::Delegate overrides: virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; |