summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-18 19:35:19 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-18 19:35:19 +0000
commit2d587947603fd887cba40f5abd64dd8559b443ae (patch)
tree5534db59285cbdf82665bf8307d2a168e279e82b
parentfd7a857793874a65e375f7ac01ec22215c4ec491 (diff)
downloadchromium_src-2d587947603fd887cba40f5abd64dd8559b443ae.zip
chromium_src-2d587947603fd887cba40f5abd64dd8559b443ae.tar.gz
chromium_src-2d587947603fd887cba40f5abd64dd8559b443ae.tar.bz2
Speculative fix for crash in the bug.
BUG=149683 Review URL: https://chromiumcodereview.appspot.com/10933136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157404 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
index 3dab64e..a040834 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -142,8 +142,10 @@ void ChromeWebContentsViewDelegateViews::ShowContextMenu(
aura::RootWindow* root_window = web_contents_window->GetRootWindow();
aura::client::ScreenPositionClient* screen_position_client =
aura::client::GetScreenPositionClient(root_window);
- screen_position_client->ConvertPointToScreen(web_contents_window,
- &screen_point);
+ if (screen_position_client) {
+ screen_position_client->ConvertPointToScreen(web_contents_window,
+ &screen_point);
+ }
#else
POINT temp = screen_point.ToPOINT();
ClientToScreen(web_contents_->GetView()->GetNativeView(), &temp);