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

Side by Side Diff: ash/test/shell_test_api.cc

Issue 14297013: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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 | Annotate | Revision Log
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/test/shell_test_api.h" 5 #include "ash/test/shell_test_api.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 9
10 #if defined(OS_CHROMEOS) 10 #if defined(OS_CHROMEOS)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() { 43 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {
44 return shell_->native_cursor_manager_; 44 return shell_->native_cursor_manager_;
45 } 45 }
46 46
47 LauncherModel* ShellTestApi::launcher_model() { 47 LauncherModel* ShellTestApi::launcher_model() {
48 return shell_->launcher_model_.get(); 48 return shell_->launcher_model_.get();
49 } 49 }
50 50
51 void ShellTestApi::DisableOutputConfiguratorAnimation() { 51 void ShellTestApi::DisableOutputConfiguratorAnimation() {
52 #if defined(OS_CHROMEOS) 52 #if defined(OS_CHROMEOS)
53 if (shell_->output_configurator_animation_.get()) { 53 if (shell_->output_configurator_animation_) {
54 shell_->output_configurator_->RemoveObserver( 54 shell_->output_configurator_->RemoveObserver(
55 shell_->output_configurator_animation_.get()); 55 shell_->output_configurator_animation_.get());
56 shell_->output_configurator_animation_.reset(); 56 shell_->output_configurator_animation_.reset();
57 } 57 }
58 #endif // defined(OS_CHROMEOS) 58 #endif // defined(OS_CHROMEOS)
59 } 59 }
60 60
61 } // namespace test 61 } // namespace test
62 } // namespace ash 62 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698