| Index: chrome/browser/chromeos/frame/browser_view.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/frame/browser_view.cc (revision 74231)
|
| +++ chrome/browser/chromeos/frame/browser_view.cc (working copy)
|
| @@ -89,7 +89,7 @@
|
| gfx::Rect tabstrip_bounds(
|
| browser_view_->frame()->GetBoundsForTabStrip(tabstrip_));
|
| gfx::Point tabstrip_origin = tabstrip_bounds.origin();
|
| - views::View::ConvertPointToView(browser_view_->GetParent(), browser_view_,
|
| + views::View::ConvertPointToView(browser_view_->parent(), browser_view_,
|
| &tabstrip_origin);
|
| tabstrip_bounds.set_origin(tabstrip_origin);
|
| return browser_view_->UseVerticalTabs() ?
|
| @@ -115,7 +115,7 @@
|
| virtual int NonClientHitTest(const gfx::Point& point) {
|
| gfx::Point point_in_browser_view_coords(point);
|
| views::View::ConvertPointToView(
|
| - browser_view_->GetParent(), browser_view_,
|
| + browser_view_->parent(), browser_view_,
|
| &point_in_browser_view_coords);
|
| return IsPointInViewsInTitleArea(point_in_browser_view_coords) ?
|
| HTCLIENT : ::BrowserViewLayout::NonClientHitTest(point);
|
| @@ -313,7 +313,7 @@
|
| // - HTCAPTION: in title bar or unobscured part of tabstrip
|
| // - HTNOWHERE: as the name implies.
|
| gfx::Point point_in_parent_coords(p);
|
| - views::View::ConvertPointToView(NULL, GetParent(), &point_in_parent_coords);
|
| + views::View::ConvertPointToView(NULL, parent(), &point_in_parent_coords);
|
| int hit_test = NonClientHitTest(point_in_parent_coords);
|
| if (hit_test == HTCAPTION || hit_test == HTNOWHERE)
|
| system_menu_menu_->RunMenuAt(p, views::Menu2::ALIGN_TOPLEFT);
|
|
|