Makes casts in DockInfoWin consistant.

Makes casts in DockInfoWin consistant.

BUG=none
TEST=none
R=ben@chromium.org


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132255

[Ben Goodger (Google), 2012-04-13 17:50:48]

LGTM

On Fri, Apr 13, 2012 at 10:36 AM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Makes casts in DockInfoWin consistant.
>
> BUG=none
> TEST=none
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10079011/<http://codereview.chromium.org/100...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/browser/ui/tabs/dock_**info_win.cc
>
>
> Index: chrome/browser/ui/tabs/dock_**info_win.cc
> diff --git a/chrome/browser/ui/tabs/dock_**info_win.cc
> b/chrome/browser/ui/tabs/dock_**info_win.cc
> index 3c39e91b93b0620b6f5f73194610dd**e1cbb18ec2..**
> e78c7d64d13f908e34a4239bfa0c2f**7a9e20fca8 100644
> --- a/chrome/browser/ui/tabs/dock_**info_win.cc
> +++ b/chrome/browser/ui/tabs/dock_**info_win.cc
> @@ -28,10 +28,8 @@ class BaseWindowFinder {
>   virtual ~BaseWindowFinder() {}
>
>  protected:
> -  // Returns true if iteration should stop, false if iteration should
> continue.
> -  virtual bool ShouldStopIterating(HWND window) = 0;
> -
>   static BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
> +    // Cast must match that in as_lparam().
>     BaseWindowFinder* finder = reinterpret_cast<**
> BaseWindowFinder*>(lParam);
>     if (finder->ignore_.find(hwnd) != finder->ignore_.end())
>       return TRUE;
> @@ -39,6 +37,14 @@ class BaseWindowFinder {
>     return finder->ShouldStopIterating(**hwnd) ? FALSE : TRUE;
>   }
>
> +  LPARAM as_lparam() {
> +    // Cast must match that in WindowCallbackProc().
> +    return reinterpret_cast<LPARAM>(**static_cast<BaseWindowFinder*>**
> (this));
> +  }
> +
> +  // Returns true if iteration should stop, false if iteration should
> continue.
> +  virtual bool ShouldStopIterating(HWND window) = 0;
> +
>  private:
>   const std::set<HWND>& ignore_;
>
> @@ -118,7 +124,7 @@ class TopMostFinder : public BaseWindowFinder {
>         screen_loc_(screen_loc),
>         is_top_most_(false),
>         tmp_region_(CreateRectRgn(0, 0, 0, 0)) {
> -    EnumWindows(**WindowCallbackProc, reinterpret_cast<LPARAM>(this)**);
> +    EnumWindows(**WindowCallbackProc, as_lparam());
>   }
>
>   // The window we're looking for.
> @@ -177,8 +183,7 @@ class LocalProcessWindowFinder : public
> BaseWindowFinder {
>       : BaseWindowFinder(ignore),
>         screen_loc_(screen_loc),
>         result_(NULL) {
> -    EnumThreadWindows(**GetCurrentThreadId(), WindowCallbackProc,
> -                      reinterpret_cast<LPARAM>(this)**);
> +    EnumThreadWindows(**GetCurrentThreadId(), WindowCallbackProc,
> as_lparam());
>   }
>
>   // Position of the mouse.
> @@ -241,8 +246,7 @@ class DockToWindowFinder : public BaseWindowFinder {
>         screen_loc);
>     if (!work_area.IsEmpty()) {
>       result_.set_monitor_bounds(**work_area);
> -      EnumThreadWindows(**GetCurrentThreadId(), WindowCallbackProc,
> -                        reinterpret_cast<LPARAM>(this)**);
> +      EnumThreadWindows(**GetCurrentThreadId(), WindowCallbackProc,
> as_lparam());
>     }
>   }
>
>
>
>

[commit-bot: I haz the power, 2012-04-13 18:10:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/10079011/1

[commit-bot: I haz the power, 2012-04-13 20:18:58]

Change committed as 132255