summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-21 02:18:43 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-21 02:18:43 +0000
commitf9ea544bd6077093d8819f646f436d7f6f15f3d5 (patch)
treec8655ff1f21fe9f4315e546956b0893f25945b33 /win8
parent7a6305192b7a864a9b5ce931ef4714ac066c7a06 (diff)
downloadchromium_src-f9ea544bd6077093d8819f646f436d7f6f15f3d5.zip
chromium_src-f9ea544bd6077093d8819f646f436d7f6f15f3d5.tar.gz
chromium_src-f9ea544bd6077093d8819f646f436d7f6f15f3d5.tar.bz2
Fixes crash in RemoteWindowTreeHostWin::HandleActivateDesktop
Rather than route this through RemoteWindowTreeHostWin (which can now be NULL) I'm routing it through ChromeMetroViewerProcessHost. I'm also adding a NULL check as it may be possible in some code paths for the host to have been disconnected and therefor NULL. BUG=374766 TEST=none R=ananta@chromium.org Review URL: https://codereview.chromium.org/297713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
-rw-r--r--win8/viewer/metro_viewer_process_host.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/win8/viewer/metro_viewer_process_host.h b/win8/viewer/metro_viewer_process_host.h
index bb97001..f2e1b45 100644
--- a/win8/viewer/metro_viewer_process_host.h
+++ b/win8/viewer/metro_viewer_process_host.h
@@ -54,10 +54,10 @@ class MetroViewerProcessHost : public IPC::Listener,
bool LaunchViewerAndWaitForConnection(
const base::string16& app_user_model_id);
- private:
// IPC::Sender implementation:
virtual bool Send(IPC::Message* msg) OVERRIDE;
+ private:
// IPC::Listener implementation:
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void OnChannelError() OVERRIDE = 0;