Refactor menu controller to isolate aura dependency.

ui/aura/env.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
@@ skipping 21 matching lines @@
   Env();
   virtual ~Env();
 
   static void CreateInstance();
   static Env* GetInstance();
   static void DeleteInstance();
 
   void AddObserver(EnvObserver* observer);
   void RemoveObserver(EnvObserver* observer);
 
-  const int mouse_button_flags() const { return mouse_button_flags_; }
+  int mouse_button_flags() const { return mouse_button_flags_; }

[tapted, 2014/05/06 00:02:46]

nit: the change here shouldn't be required any more - it would be a good way to
check we're not including it by accident :) (but also it should still be done at
some point - just looks suspicious in this CL)

[Andre, 2014/05/07 23:12:39]

Done.

   void set_mouse_button_flags(int mouse_button_flags) {
     mouse_button_flags_ = mouse_button_flags;
   }
   // Returns true if a mouse button is down. This may query the native OS,
   // otherwise it uses |mouse_button_flags_|.
   bool IsMouseButtonDown() const;
 
   // Gets/sets the last mouse location seen in a mouse event in the screen
   // coordinates.
   const gfx::Point& last_mouse_location() const { return last_mouse_location_; }
@@ skipping 37 matching lines @@
 
   scoped_ptr<InputStateLookup> input_state_lookup_;
   scoped_ptr<ui::PlatformEventSource> event_source_;
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_