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

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

Issue 23808004: Revert 221197 "Adds an integration test for uninstalling app lis..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | « trunk/src/ash/test/shell_test_api.h ('k') | trunk/src/ash/wm/app_list_controller.h » ('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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 internal::DragDropController* ShellTestApi::drag_drop_controller() { 51 internal::DragDropController* ShellTestApi::drag_drop_controller() {
52 return shell_->drag_drop_controller_.get(); 52 return shell_->drag_drop_controller_.get();
53 } 53 }
54 54
55 internal::AppListController* ShellTestApi::app_list_controller() {
56 return shell_->app_list_controller_.get();
57 }
58
59 void ShellTestApi::DisableOutputConfiguratorAnimation() { 55 void ShellTestApi::DisableOutputConfiguratorAnimation() {
60 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
61 if (shell_->output_configurator_animation_) { 57 if (shell_->output_configurator_animation_) {
62 shell_->output_configurator_->RemoveObserver( 58 shell_->output_configurator_->RemoveObserver(
63 shell_->output_configurator_animation_.get()); 59 shell_->output_configurator_animation_.get());
64 shell_->output_configurator_animation_.reset(); 60 shell_->output_configurator_animation_.reset();
65 } 61 }
66 #endif // defined(OS_CHROMEOS) 62 #endif // defined(OS_CHROMEOS)
67 } 63 }
68 64
69 } // namespace test 65 } // namespace test
70 } // namespace ash 66 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/test/shell_test_api.h ('k') | trunk/src/ash/wm/app_list_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698