| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "blimp/client/compositor/blimp_compositor_android.h" | 5 #include "blimp/client/app/android/blimp_compositor_android.h" |
| 6 |
| 7 #include <algorithm> |
| 6 | 8 |
| 7 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 8 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 9 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
| 10 | 12 |
| 11 namespace { | 13 namespace { |
| 12 // The minimum valid content width in a tile. This is used to make sure the | 14 // The minimum valid content width in a tile. This is used to make sure the |
| 13 // width of the content on the rightmost tile isn't a tiny sliver. | 15 // width of the content on the rightmost tile isn't a tiny sliver. |
| 14 const int kMinimumTileContentWidthPixels = 64; | 16 const int kMinimumTileContentWidthPixels = 64; |
| 15 } | 17 } |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 if (numTiles > 16) | 88 if (numTiles > 16) |
| 87 default_tile_size = 384; | 89 default_tile_size = 384; |
| 88 if (numTiles >= 40) | 90 if (numTiles >= 40) |
| 89 default_tile_size = 512; | 91 default_tile_size = 512; |
| 90 } | 92 } |
| 91 settings->default_tile_size.SetSize(default_tile_size, default_tile_size); | 93 settings->default_tile_size.SetSize(default_tile_size, default_tile_size); |
| 92 } | 94 } |
| 93 | 95 |
| 94 } // namespace client | 96 } // namespace client |
| 95 } // namespace blimp | 97 } // namespace blimp |
| OLD | NEW |