| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/views/test/test_views_delegate.h" | 5 #include "ui/views/test/test_views_delegate.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
| 9 | 9 |
| 10 #if !defined(OS_CHROMEOS) | 10 #if !defined(OS_CHROMEOS) |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 } | 52 } |
| 53 | 53 |
| 54 ui::ContextFactoryPrivate* TestViewsDelegate::GetContextFactoryPrivate() { | 54 ui::ContextFactoryPrivate* TestViewsDelegate::GetContextFactoryPrivate() { |
| 55 if (context_factory_private_) | 55 if (context_factory_private_) |
| 56 return context_factory_private_; | 56 return context_factory_private_; |
| 57 if (aura::Env::GetInstance()) | 57 if (aura::Env::GetInstance()) |
| 58 return aura::Env::GetInstance()->context_factory_private(); | 58 return aura::Env::GetInstance()->context_factory_private(); |
| 59 return nullptr; | 59 return nullptr; |
| 60 } | 60 } |
| 61 | 61 |
| 62 const TypographyProvider& TestViewsDelegate::GetTypographyProvider() const { | |
| 63 return typography_provider_; | |
| 64 } | |
| 65 | |
| 66 } // namespace views | 62 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2758323002:
Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
