OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "chrome/browser/android/vr_shell/textures/insecure_content_permanent_te xture.h" | 5 #include "chrome/browser/android/vr_shell/textures/insecure_content_permanent_te xture.h" |
6 | 6 |
7 #include "cc/paint/skia_paint_canvas.h" | 7 #include "cc/paint/skia_paint_canvas.h" |
8 #include "chrome/grit/generated_resources.h" | 8 #include "components/strings/grit/components_strings.h" |
mthiesse
2017/05/03 02:27:43
I think you need to make the same change to insecu
| |
9 #include "ui/base/l10n/l10n_util.h" | 9 #include "ui/base/l10n/l10n_util.h" |
10 #include "ui/gfx/canvas.h" | 10 #include "ui/gfx/canvas.h" |
11 #include "ui/gfx/font_list.h" | 11 #include "ui/gfx/font_list.h" |
12 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
13 #include "ui/gfx/geometry/vector2d.h" | 13 #include "ui/gfx/geometry/vector2d.h" |
14 #include "ui/gfx/paint_vector_icon.h" | 14 #include "ui/gfx/paint_vector_icon.h" |
15 #include "ui/gfx/vector_icon_types.h" | 15 #include "ui/gfx/vector_icon_types.h" |
16 #include "ui/vector_icons/vector_icons.h" | 16 #include "ui/vector_icons/vector_icons.h" |
17 | 17 |
18 namespace vr_shell { | 18 namespace vr_shell { |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
84 // Ensuring height is a quarter of the width. | 84 // Ensuring height is a quarter of the width. |
85 int height = maximum_width / 4; | 85 int height = maximum_width / 4; |
86 return gfx::Size(height * 4, height); | 86 return gfx::Size(height * 4, height); |
87 } | 87 } |
88 | 88 |
89 gfx::SizeF InsecureContentPermanentTexture::GetDrawnSize() const { | 89 gfx::SizeF InsecureContentPermanentTexture::GetDrawnSize() const { |
90 return size_; | 90 return size_; |
91 } | 91 } |
92 | 92 |
93 } // namespace vr_shell | 93 } // namespace vr_shell |
OLD | NEW |