Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Side by Side Diff: ui/views/test/test_views_delegate_aura.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "ui/aura/env.h" 8 #include "ui/aura/env.h"
8 #include "ui/wm/core/wm_state.h" 9 #include "ui/wm/core/wm_state.h"
9 10
10 #if !defined(OS_CHROMEOS) 11 #if !defined(OS_CHROMEOS)
11 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
12 #endif // !defined(OS_CHROMEOS) 13 #endif // !defined(OS_CHROMEOS)
13 14
14 15
15 namespace views { 16 namespace views {
16 17
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 49
49 ui::ContextFactory* TestViewsDelegate::GetContextFactory() { 50 ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
50 if (context_factory_) 51 if (context_factory_)
51 return context_factory_; 52 return context_factory_;
52 if (aura::Env::GetInstance()) 53 if (aura::Env::GetInstance())
53 return aura::Env::GetInstance()->context_factory(); 54 return aura::Env::GetInstance()->context_factory();
54 return nullptr; 55 return nullptr;
55 } 56 }
56 57
57 } // namespace views 58 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698