Simplify some mojo_shell code.

mojo/services/kiosk_wm/kiosk_wm.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/kiosk_wm/kiosk_wm.h"
 
 #include "mojo/services/kiosk_wm/merged_service_provider.h"
 #include "mojo/services/window_manager/basic_focus_rules.h"
 
 namespace kiosk_wm {
@@ skipping 36 matching lines @@
 
 void KioskWM::OnEmbed(
     mojo::View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
   // KioskWM does not support being embedded more than once.
   CHECK(!root_);
 
   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());
   root_->AddChild(content_);
   content_->SetVisible(true);
 
   window_manager_app_->InitFocus(
       make_scoped_ptr(new window_manager::BasicFocusRules(root_)));
   window_manager_app_->accelerator_manager()->Register(
       ui::Accelerator(ui::VKEY_BROWSER_BACK, 0),
@@ skipping 55 matching lines @@
     return false;
   navigator_host_.RequestNavigateHistory(-1);
   return true;
 }
 
 bool KioskWM::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace kiosk_wm