diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 00:09:19 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 00:09:19 +0000 |
| commit | cbd4501c6c1658f102bb3fdac5c4f0e0c60b4520 (patch) | |
| tree | bf884f8e73010f00d807d99adffe2ac58fad68e4 | |
| parent | 1a0a6377a01d78d0959daa8390c4ccdf6bc3b684 (diff) | |
| download | chromium_src-cbd4501c6c1658f102bb3fdac5c4f0e0c60b4520.zip chromium_src-cbd4501c6c1658f102bb3fdac5c4f0e0c60b4520.tar.gz chromium_src-cbd4501c6c1658f102bb3fdac5c4f0e0c60b4520.tar.bz2 | |
Change the type of the parameter of GetRootWindowForDisplayId() from int to int64.
Because we changed the way of generating a display ID in r152519, now the ID could be huge. Without the change the function might return NULL, which usually crashes Chrome.
BUG=139103
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10866011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152679 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/display/display_controller.cc | 2 | ||||
| -rw-r--r-- | ash/display/display_controller.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 85c7f83..329a7eb 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -82,7 +82,7 @@ aura::RootWindow* DisplayController::GetPrimaryRootWindow() { return root_windows_[display_manager->GetDisplayAt(0)->id()]; } -aura::RootWindow* DisplayController::GetRootWindowForDisplayId(int id) { +aura::RootWindow* DisplayController::GetRootWindowForDisplayId(int64 id) { return root_windows_[id]; } diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h index 23ed86c..41aaeb1 100644 --- a/ash/display/display_controller.h +++ b/ash/display/display_controller.h @@ -51,7 +51,7 @@ class ASH_EXPORT DisplayController : public aura::DisplayObserver { aura::RootWindow* GetPrimaryRootWindow(); // Returns the root window for |display_id|. - aura::RootWindow* GetRootWindowForDisplayId(int id); + aura::RootWindow* GetRootWindowForDisplayId(int64 id); // Closes all child windows in the all root windows. void CloseChildWindows(); |