Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: ash/host/ash_window_tree_host.h

Issue 1683853003: Revert of ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/host/ash_window_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host.h
diff --git a/ash/host/ash_window_tree_host.h b/ash/host/ash_window_tree_host.h
index f9ac376f9bc268b9f54fa5545c3196fe6b2a4c6f..54724aa5fcf9224d43fdba04e571375d7ff004b0 100644
--- a/ash/host/ash_window_tree_host.h
+++ b/ash/host/ash_window_tree_host.h
@@ -6,7 +6,6 @@
#define ASH_HOST_ASH_WINDOW_TREE_HOST_H_
#include "ash/ash_export.h"
-#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
namespace aura {
@@ -32,15 +31,12 @@
class ASH_EXPORT AshWindowTreeHost {
public:
- using Factory =
- base::Callback<AshWindowTreeHost*(const AshWindowTreeHostInitParams&)>;
AshWindowTreeHost();
virtual ~AshWindowTreeHost() {}
// Creates a new AshWindowTreeHost. The caller owns the returned value.
static AshWindowTreeHost* Create(
const AshWindowTreeHostInitParams& init_params);
- static void SetFactory(const Factory& factory);
void set_input_method_handler(InputMethodEventHandler* input_method_handler) {
input_method_handler_ = input_method_handler;
« no previous file with comments | « no previous file | ash/host/ash_window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698