Simplify some mojo_shell code.

mojo/services/kiosk_wm/kiosk_wm.cc

Index: mojo/services/kiosk_wm/kiosk_wm.cc
diff --git a/mojo/services/kiosk_wm/kiosk_wm.cc b/mojo/services/kiosk_wm/kiosk_wm.cc
index 9aa2aab2b8badcb1cb986f02e51fb53ec91e2fe7..28b5b5ebf09c4b6743bec8781d8221a9a7a5dcd4 100644
--- a/mojo/services/kiosk_wm/kiosk_wm.cc
+++ b/mojo/services/kiosk_wm/kiosk_wm.cc
@@ -55,8 +55,7 @@ void KioskWM::OnEmbed(
   root_ = root;
   root_->AddObserver(this);
 

[cpu_(ooo_6.6-7.5), 2015/04/06 20:43:48]

ifdef(os_win) ?

I mean keep both sizes

[jam, 2015/04/06 22:02:51]

this is only used on desktop, so it's not hit on android

[sky, 2015/04/08 19:17:46]

Actually, we do use this on the device as well. I suspect we won't long term,
but in the short term we do.

[jam, 2015/04/10 01:29:55]

ah I was mistaken, thanks for clarifying. I'll undo this for android

-  // Resize to match the Nexus 5 aspect ratio:
-  window_manager_app_->SetViewportSize(gfx::Size(320, 640));
+  window_manager_app_->SetViewportSize(gfx::Size(1280, 800));
 
   content_ = root->view_manager()->CreateView();
   content_->SetBounds(root_->bounds());