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

Side by Side Diff: win8/metro_driver/metro_driver_win7.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 presubmit errors 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 unified diff | Download patch
« no previous file with comments | « win8/metro_driver/ime/text_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "stdafx.h" 5 #include "stdafx.h"
6 #include <corewindow.h> 6 #include <corewindow.h>
7 #include <shobjidl.h> 7 #include <shobjidl.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/gfx/geometry/safe_integer_conversions.h" 10 #include "ui/gfx/geometry/safe_integer_conversions.h"
(...skipping 1211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 return S_OK; 1222 return S_OK;
1223 } 1223 }
1224 1224
1225 private: 1225 private:
1226 mswr::ComPtr<winapp::Core::IFrameworkView> app_view_; 1226 mswr::ComPtr<winapp::Core::IFrameworkView> app_view_;
1227 mswr::ComPtr<CoreApplicationViewEmulation> view_emulation_; 1227 mswr::ComPtr<CoreApplicationViewEmulation> view_emulation_;
1228 }; 1228 };
1229 1229
1230 1230
1231 mswr::ComPtr<winapp::Core::ICoreApplication> InitWindows7() { 1231 mswr::ComPtr<winapp::Core::ICoreApplication> InitWindows7() {
1232 HRESULT hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED); 1232 HRESULT hr = ::CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
1233 if (FAILED(hr)) 1233 if (FAILED(hr))
1234 CHECK(false); 1234 CHECK(false);
1235 return mswr::Make<CoreApplicationWin7Emulation>(); 1235 return mswr::Make<CoreApplicationWin7Emulation>();
1236 } 1236 }
1237 1237
OLDNEW
« no previous file with comments | « win8/metro_driver/ime/text_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698