summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2014-09-18 16:18:53 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-18 23:19:21 +0000
commitab2f6b9ce3ba02a2bf397a1f3b875171cc9abdc4 (patch)
tree569ca64ba5cbda804fe32e0bd6b552a8c76a53d3 /win8
parent58e626306222a0a17291b05f2be06eb137997fcf (diff)
downloadchromium_src-ab2f6b9ce3ba02a2bf397a1f3b875171cc9abdc4.zip
chromium_src-ab2f6b9ce3ba02a2bf397a1f3b875171cc9abdc4.tar.gz
chromium_src-ab2f6b9ce3ba02a2bf397a1f3b875171cc9abdc4.tar.bz2
Don't call ICoreWindow::Activate
Apparently (?) unnecessary, and it sometimes hangs in that call. This doesn't seem to help the 16s timeout (per tryjobs here), but doesn't seem to hurt either, and I can run on a local VM this way at least. BUG=411147 Review URL: https://codereview.chromium.org/583443005 Cr-Commit-Position: refs/heads/master@{#295594}
Diffstat (limited to 'win8')
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 0d1ea8b..db2d9f3 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -677,12 +677,6 @@ ChromeAppViewAsh::Run() {
HRESULT hr = window_->get_Dispatcher(dispatcher.GetAddressOf());
CheckHR(hr, "Dispatcher failed.");
- hr = window_->Activate();
- if (FAILED(hr)) {
- DLOG(WARNING) << "activation failed hr=" << hr;
- return hr;
- }
-
// Create the IPC channel IO thread. It needs to out-live the ChannelProxy.
base::Thread io_thread("metro_IO_thread");
base::Thread::Options options;