| 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/widget_test.h" | 5 #include "ui/views/test/widget_test.h" |
| 6 | 6 |
| 7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #import "base/mac/scoped_nsobject.h" | 9 #import "base/mac/scoped_nsobject.h" |
| 10 #import "base/mac/scoped_objc_class_swizzler.h" | 10 #import "base/mac/scoped_objc_class_swizzler.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 return false; | 72 return false; |
| 73 } | 73 } |
| 74 | 74 |
| 75 // static | 75 // static |
| 76 ui::EventProcessor* WidgetTest::GetEventProcessor(Widget* widget) { | 76 ui::EventProcessor* WidgetTest::GetEventProcessor(Widget* widget) { |
| 77 return static_cast<internal::RootView*>(widget->GetRootView()); | 77 return static_cast<internal::RootView*>(widget->GetRootView()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 // static | 80 // static |
| 81 scoped_ptr<WidgetTest::FakeActivation> WidgetTest::FakeWidgetIsActiveAlways() { | 81 scoped_ptr<WidgetTest::FakeActivation> WidgetTest::FakeWidgetIsActiveAlways() { |
| 82 return scoped_ptr<FakeActivation>(new FakeActivationMac); | 82 return make_scoped_ptr(new FakeActivationMac); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace test | 85 } // namespace test |
| 86 } // namespace views | 86 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 922923002:
ui: Cleanup the usage of scoped_ptr throughout. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master