Chromium Code Reviews| Index: ui/gfx/render_text_ozone.cc |
| diff --git a/ui/gfx/platform_font_android.cc b/ui/gfx/render_text_ozone.cc |
| similarity index 55% |
| copy from ui/gfx/platform_font_android.cc |
| copy to ui/gfx/render_text_ozone.cc |
| index 332a0788ea5826563470012f1df773465b27974c..40672a57c6f8fcb11d0b0cd38a62b72774ab9789 100644 |
| --- a/ui/gfx/platform_font_android.cc |
| +++ b/ui/gfx/render_text_ozone.cc |
| @@ -1,30 +1,23 @@ |
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| -// Use of this source code is governed by a BSD-style license that can be |
| -// found in the LICENSE file. |
| - |
| #include "ui/gfx/platform_font.h" |
| - |
| -#include "base/logging.h" |
| +#include "ui/gfx/render_text.h" |
| namespace gfx { |
| -// static |
| +RenderText* RenderText::CreateInstance() { |
| + return NULL; |
| +} |
| + |
| PlatformFont* PlatformFont::CreateDefault() { |
|
msw
2013/11/04 23:10:46
Shouldn't these live in platform_font_ozone.cc, no
sadrul
2013/11/05 02:42:27
Done.
|
| - NOTIMPLEMENTED(); |
| return NULL; |
| } |
| -// static |
| PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) { |
| - NOTIMPLEMENTED(); |
| return NULL; |
| } |
| -// static |
| PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, |
| int font_size) { |
| - NOTIMPLEMENTED(); |
| return NULL; |
| } |
| -} // namespace gfx |
| +} // namespace gfx |