ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

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 <memory>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/supports_user_data.h"
 #include "ui/aura/aura_export.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_target.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace ui {
 class ContextFactory;
+class ContextFactoryPrivate;
 class PlatformEventSource;
 }
 namespace aura {
 
 namespace client {
 class FocusClient;
 }
 
 namespace test {
 class EnvTestHelper;
@@ skipping 50 matching lines @@
 
   // Whether any touch device is currently down.
   bool is_touch_down() const { return is_touch_down_; }
   void set_touch_down(bool value) { is_touch_down_ = value; }
 
   void set_context_factory(ui::ContextFactory* context_factory) {
     context_factory_ = context_factory;
   }
   ui::ContextFactory* context_factory() { return context_factory_; }
 
+  void set_context_factory_private(
+      ui::ContextFactoryPrivate* context_factory_private) {
+    context_factory_private_ = context_factory_private;
+  }
+  ui::ContextFactoryPrivate* context_factory_private() {
+    return context_factory_private_;
+  }
+
   // See CreateInstance() for description.
   void SetWindowTreeClient(WindowTreeClient* window_tree_client);
   bool HasWindowTreeClient() const { return window_tree_client_ != nullptr; }
 
   // Sets the active FocusClient and the window the FocusClient is associated
   // with. |window| is not necessarily the window that actually has focus.
   // |window| may be null, which indicates all windows share a FocusClient.
   void SetActiveFocusClient(client::FocusClient* focus_client,
                             Window* focus_client_root);
   client::FocusClient* active_focus_client() { return active_focus_client_; }
@@ skipping 36 matching lines @@
 
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
   gfx::Point last_mouse_location_;
   bool is_touch_down_;
 
   std::unique_ptr<InputStateLookup> input_state_lookup_;
   std::unique_ptr<ui::PlatformEventSource> event_source_;
 
   ui::ContextFactory* context_factory_;
+  ui::ContextFactoryPrivate* context_factory_private_;
 
   Window* active_focus_client_root_ = nullptr;
   client::FocusClient* active_focus_client_ = nullptr;
   std::unique_ptr<ActiveFocusClientWindowObserver>
       active_focus_client_window_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_