| Index: ui/aura_shell/shell.h
|
| ===================================================================
|
| --- ui/aura_shell/shell.h (revision 114099)
|
| +++ ui/aura_shell/shell.h (working copy)
|
| @@ -32,7 +32,6 @@
|
| class ShellTooltipManager;
|
|
|
| namespace internal {
|
| -class ActivationController;
|
| class AppList;
|
| class DragDropController;
|
| class ShadowController;
|
| @@ -110,7 +109,6 @@
|
|
|
| scoped_ptr<internal::AppList> app_list_;
|
|
|
| - scoped_ptr<internal::ActivationController> activation_controller_;
|
| scoped_ptr<internal::DragDropController> drag_drop_controller_;
|
| scoped_ptr<internal::WorkspaceController> workspace_controller_;
|
| scoped_ptr<internal::ShadowController> shadow_controller_;
|
|
|
| Property changes on: ui\aura_shell\shell.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|