Add desktop vs. ash context to ui_controls

ash/shell_factory.h

Index: ash/shell_factory.h
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index db6320c1530bbabd925bebac0b64c9e2a7a47805..d7b0681570d5ec4edf19b219e5fefbbe1ee935fd 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -17,7 +17,7 @@ class ImageSkia;
 }
 
 namespace ui_controls {
-class UIControlsAura;
+class UIControls;
 }
 
 namespace views {
@@ -35,7 +35,7 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window,
 
 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
 
-ui_controls::UIControlsAura* CreateUIControls();
+ui_controls::UIControls* CreateUIControls();
 }  // namespace internal
 
 }  // namespace ash