diff options
| author | msw <msw@chromium.org> | 2015-05-08 15:28:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-08 22:30:16 +0000 |
| commit | 8a94811ea7599ac31bff5b99ccf353aeb76b67c4 (patch) | |
| tree | 2fe8ad1d15e4ca3da941c59f301e84d788cc8421 /mandoline | |
| parent | 22d6ca1804b55d97852dc6c92e480f173c3909a8 (diff) | |
| download | chromium_src-8a94811ea7599ac31bff5b99ccf353aeb76b67c4.zip chromium_src-8a94811ea7599ac31bff5b99ccf353aeb76b67c4.tar.gz chromium_src-8a94811ea7599ac31bff5b99ccf353aeb76b67c4.tar.bz2 | |
Fix the Android Mandoline ui build.
Broken from https://codereview.chromium.org/1136593004
http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android/builds/1275
BUG=NONE
TEST=Build passes.
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1129033004
Cr-Commit-Position: refs/heads/master@{#329023}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/ui/browser/android/android_ui.cc | 9 | ||||
| -rw-r--r-- | mandoline/ui/browser/android/android_ui.h | 3 | ||||
| -rw-r--r-- | mandoline/ui/browser/browser_ui.h | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/mandoline/ui/browser/android/android_ui.cc b/mandoline/ui/browser/android/android_ui.cc index 3a414c6..d997366 100644 --- a/mandoline/ui/browser/android/android_ui.cc +++ b/mandoline/ui/browser/android/android_ui.cc @@ -4,15 +4,10 @@ #include "mandoline/ui/browser/android/android_ui.h" -namespace mojo { -class Shell; -class View; -} +#include "components/view_manager/public/cpp/view.h" namespace mandoline { -class Browser; - AndroidUI::AndroidUI(Browser* browser, mojo::Shell* shell) : browser_(browser), shell_(shell), @@ -20,7 +15,7 @@ AndroidUI::AndroidUI(Browser* browser, mojo::Shell* shell) content_(nullptr) {} AndroidUI::~AndroidUI() {} -void AndroidUI::Init(mojo::View* root, mojo::View* content_) { +void AndroidUI::Init(mojo::View* root, mojo::View* content) { root_ = root; content_ = content; diff --git a/mandoline/ui/browser/android/android_ui.h b/mandoline/ui/browser/android/android_ui.h index 1f90df0..f3fd975 100644 --- a/mandoline/ui/browser/android/android_ui.h +++ b/mandoline/ui/browser/android/android_ui.h @@ -5,6 +5,9 @@ #ifndef MANDOLINE_UI_BROWSER_ANDROID_ANDROID_UI_H_ #define MANDOLINE_UI_BROWSER_ANDROID_ANDROID_UI_H_ +#include "base/macros.h" +#include "mandoline/ui/browser/browser_ui.h" + namespace mojo { class Shell; class View; diff --git a/mandoline/ui/browser/browser_ui.h b/mandoline/ui/browser/browser_ui.h index f924de7..978943c 100644 --- a/mandoline/ui/browser/browser_ui.h +++ b/mandoline/ui/browser/browser_ui.h @@ -21,7 +21,6 @@ class BrowserUI { // Called when the Browser UI is embedded within the specified view. virtual void Init(mojo::View* root, mojo::View* content) = 0; - }; } // namespace mandoline |