summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshrikant <shrikant@chromium.org>2014-12-16 13:25:29 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-16 21:25:59 +0000
commit1eb123b01ac02e2fe507b0956f640db5476cf7ff (patch)
treec9a64152ed2c6035a864e46c033faa6552882dc9
parent018271e37da4447f89ac0c8cdc24cf967eb78407 (diff)
downloadchromium_src-1eb123b01ac02e2fe507b0956f640db5476cf7ff.zip
chromium_src-1eb123b01ac02e2fe507b0956f640db5476cf7ff.tar.gz
chromium_src-1eb123b01ac02e2fe507b0956f640db5476cf7ff.tar.bz2
Windows 10/ MetroUI - Added validation for ui_channel during size change event.
With new StartChromeOSMode function we keep on retrying channel connection in posted/delayed task. Meanwhile metro enviroment sends us size change, which we try to pass-on ui_channel_ without validating. BUG=440475 R=cpu, ananta Review URL: https://codereview.chromium.org/809653002 Cr-Commit-Position: refs/heads/master@{#308669}
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 2e8b1cb..edcf4b7 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -1382,7 +1382,7 @@ void ChromeAppViewAsh::OnNavigateToUrl(const base::string16& url) {
HRESULT ChromeAppViewAsh::OnSizeChanged(winui::Core::ICoreWindow* sender,
winui::Core::IWindowSizeChangedEventArgs* args) {
- if (!window_) {
+ if (!window_ || !ui_channel_) {
return S_OK;
}