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

Unified Diff: ash/shell_init_params.h

Issue 2339633002: mash: Port KeyboardUIMus to mojo:ash; remove sysui. (Closed)
Patch Set: Add mash NOTIMPLEMENTED() in AccessibilityManager::UpdateVirtualKeyboardFromPref() Created 4 years, 3 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 | « ash/shell.cc ('k') | ash/shell_init_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_init_params.h
diff --git a/ash/shell_init_params.h b/ash/shell_init_params.h
index edca1f4d96e2e4756047c4b1720ce1bb7377194f..8cff2f1d9567887f8b82090d0f70789a3c9d61e4 100644
--- a/ash/shell_init_params.h
+++ b/ash/shell_init_params.h
@@ -5,16 +5,7 @@
#ifndef ASH_SHELL_INIT_PARAMS_H_
#define ASH_SHELL_INIT_PARAMS_H_
-#include <memory>
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
-
#include "ash/ash_export.h"
-#include "base/callback.h"
namespace base {
class SequencedWorkerPool;
@@ -26,26 +17,12 @@ class ContextFactory;
namespace ash {
-class KeyboardUI;
class ShellDelegate;
struct ASH_EXPORT ShellInitParams {
- ShellInitParams();
- ~ShellInitParams();
-
- ShellDelegate* delegate;
-
- ui::ContextFactory* context_factory;
- base::SequencedWorkerPool* blocking_pool;
-
- // True if running inside mus.
- bool in_mus = false;
-
- base::Callback<std::unique_ptr<KeyboardUI>()> keyboard_factory;
-
-#if defined(OS_WIN)
- HWND remote_hwnd;
-#endif
+ ShellDelegate* delegate = nullptr;
+ ui::ContextFactory* context_factory = nullptr;
+ base::SequencedWorkerPool* blocking_pool = nullptr;
};
} // namespace ash
« no previous file with comments | « ash/shell.cc ('k') | ash/shell_init_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698