diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 01:42:19 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 01:42:19 +0000 |
| commit | 41381b86b101dda0dd80863a02afa34a1c88b872 (patch) | |
| tree | b34af3ee195137299bfd2f9afe28ac9efc3e94b2 /ui/aura_shell | |
| parent | 7ec6f3878bd653c52b69f45936c4aa5e4eeaee90 (diff) | |
| download | chromium_src-41381b86b101dda0dd80863a02afa34a1c88b872.zip chromium_src-41381b86b101dda0dd80863a02afa34a1c88b872.tar.gz chromium_src-41381b86b101dda0dd80863a02afa34a1c88b872.tar.bz2 | |
Fix gcc 4.6 build break.
ui/aura_shell/stacking_controller.cc: In static member function 'static aura::Window* aura_shell::internal::StackingController::GetActivatableWindow(aura::Window*)':
ui/aura_shell/stacking_controller.cc:48:10: error: converting 'false' to pointer type 'aura::Window*' [-Werror=conversion-null]
BUG=None
TEST=build Chrome for Chrome OS with USE=aura inside Chrome OS chroot
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8469021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/stacking_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/aura_shell/stacking_controller.cc b/ui/aura_shell/stacking_controller.cc index 1371c20..7e297f6 100644 --- a/ui/aura_shell/stacking_controller.cc +++ b/ui/aura_shell/stacking_controller.cc @@ -45,7 +45,7 @@ aura::Window* StackingController::GetActivatableWindow(aura::Window* window) { parent = parent->parent(); child = child->parent(); } - return false; + return NULL; } //////////////////////////////////////////////////////////////////////////////// |