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

Unified Diff: chrome/browser/ui/views/app_list/win/app_list_service_win.cc

Issue 645683002: Get IME's to work in Chrome OS mode on Windows 7. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build error Created 6 years, 2 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 | ui/base/ime/remote_input_method_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/app_list/win/app_list_service_win.cc
diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
index bdbc15278ece6e60abf033b51de3e85c83298ef7..c1843a219abf4e7ab6a16cdb236611aa71ac9e53 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
+++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
@@ -39,6 +39,7 @@
#include "content/public/browser/browser_thread.h"
#include "ui/app_list/views/app_list_view.h"
#include "ui/base/win/shell.h"
+#include "ui/base/ui_base_switches.h"
#if defined(GOOGLE_CHROME_BUILD)
#include "chrome/installer/util/google_update_settings.h"
@@ -49,7 +50,8 @@
// static
AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
- if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
+ if ((desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) ||
+ (CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect)))
tapted 2014/10/09 22:33:09 This doesn't look right. Clicking the taskbar app
ananta 2014/10/09 22:55:02 Creating a desktop environment breaks IME support
return AppListServiceAsh::GetInstance();
return AppListServiceWin::GetInstance();
@@ -57,8 +59,11 @@ AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
// static
void AppListService::InitAll(Profile* initial_profile) {
- AppListServiceAsh::GetInstance()->Init(initial_profile);
- AppListServiceWin::GetInstance()->Init(initial_profile);
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect)) {
+ AppListServiceAsh::GetInstance()->Init(initial_profile);
+ } else {
tapted 2014/10/09 22:33:09 Bringing up the Ash service conditionally is proba
+ AppListServiceWin::GetInstance()->Init(initial_profile);
+ }
}
namespace {
« no previous file with comments | « no previous file | ui/base/ime/remote_input_method_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698