| Index: ash/wm/workspace/workspace_window_resizer.h
|
| diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h
|
| index 8bf065710df4b7d21242eb2167ee8dc1a25a995e..7a80566ef039ad464e50bc86d17a75eac67c036e 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.h
|
| +++ b/ash/wm/workspace/workspace_window_resizer.h
|
| @@ -2,15 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
|
| -#define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
|
| +#ifndef ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
|
| +#define ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
|
|
|
| #include <vector>
|
|
|
| #include "ash/wm/window_resizer.h"
|
| #include "ash/wm/workspace/magnetism_matcher.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/gtest_prod_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "ui/aura/window_tracker.h"
|
| @@ -91,7 +90,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| // Divides |amount| evenly between |sizes|. If |amount| is negative it
|
| // indicates how many pixels |sizes| should be shrunk by.
|
| // Returns how many pixels failed to be allocated/removed from |sizes|.
|
| - int GrowFairly(int amount, std::vector<WindowSize>& sizes) const;
|
| + int GrowFairly(int amount, std::vector<WindowSize>* sizes) const;
|
|
|
| // Calculate the ratio of pixels that each WindowSize in |sizes| should
|
| // receive when growing or shrinking.
|
| @@ -223,4 +222,4 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
|
| +#endif // ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
|
|
|