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

Side by Side Diff: ui/views/test/desktop_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/desktop_test_views_delegate.h" 5 #include "ui/views/test/desktop_test_views_delegate.h"
6 6
7 #include "build/build_config.h"
7 #include "ui/views/widget/native_widget_aura.h" 8 #include "ui/views/widget/native_widget_aura.h"
8 9
9 #if !defined(OS_CHROMEOS) 10 #if !defined(OS_CHROMEOS)
10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 11 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
11 #endif 12 #endif
12 13
13 namespace views { 14 namespace views {
14 15
15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} 16 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {}
16 17
(...skipping 12 matching lines...) Expand all
29 params->type != views::Widget::InitParams::TYPE_MENU && 30 params->type != views::Widget::InitParams::TYPE_MENU &&
30 params->type != views::Widget::InitParams::TYPE_TOOLTIP) { 31 params->type != views::Widget::InitParams::TYPE_TOOLTIP) {
31 params->native_widget = new views::NativeWidgetAura(delegate); 32 params->native_widget = new views::NativeWidgetAura(delegate);
32 } else { 33 } else {
33 params->native_widget = new views::DesktopNativeWidgetAura(delegate); 34 params->native_widget = new views::DesktopNativeWidgetAura(delegate);
34 } 35 }
35 #endif 36 #endif
36 } 37 }
37 38
38 } // namespace views 39 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698