Commit d23fc1d0 authored by sky's avatar sky Committed by Commit bot

Fixes android mandoline ui

Latest changes broke the android side.

R=ben@chromium.org
BUG=none
TEST=none

Review URL: https://codereview.chromium.org/1134443005

Cr-Commit-Position: refs/heads/master@{#329702}
parent 01d9b43f
...@@ -16,8 +16,7 @@ class Browser; ...@@ -16,8 +16,7 @@ class Browser;
AndroidUI::AndroidUI(Browser* browser, mojo::ApplicationImpl* application_impl) AndroidUI::AndroidUI(Browser* browser, mojo::ApplicationImpl* application_impl)
: browser_(browser), : browser_(browser),
application_impl_(application_impl), application_impl_(application_impl),
root_(nullptr), root_(nullptr) {}
content_(nullptr) {}
AndroidUI::~AndroidUI() { AndroidUI::~AndroidUI() {
root_->RemoveObserver(this); root_->RemoveObserver(this);
...@@ -36,7 +35,7 @@ void AndroidUI::OnURLChanged() { ...@@ -36,7 +35,7 @@ void AndroidUI::OnURLChanged() {
void AndroidUI::OnViewBoundsChanged(mojo::View* view, void AndroidUI::OnViewBoundsChanged(mojo::View* view,
const mojo::Rect& old_bounds, const mojo::Rect& old_bounds,
const mojo::Rect& new_bounds) { const mojo::Rect& new_bounds) {
content_->SetBounds( browser_->content()->SetBounds(
*mojo::Rect::From(gfx::Rect(0, 0, new_bounds.width, new_bounds.height))); *mojo::Rect::From(gfx::Rect(0, 0, new_bounds.width, new_bounds.height)));
} }
......
...@@ -37,7 +37,6 @@ class AndroidUI : public BrowserUI, ...@@ -37,7 +37,6 @@ class AndroidUI : public BrowserUI,
Browser* browser_; Browser* browser_;
mojo::ApplicationImpl* application_impl_; mojo::ApplicationImpl* application_impl_;
mojo::View* root_; mojo::View* root_;
mojo::View* content_;
DISALLOW_COPY_AND_ASSIGN(AndroidUI); DISALLOW_COPY_AND_ASSIGN(AndroidUI);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment