diff options
| author | hashimoto <hashimoto@chromium.org> | 2014-11-13 18:11:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-14 02:12:05 +0000 |
| commit | ffe920cc73ea11dbfedfccad8c8af4478ba189bb (patch) | |
| tree | c8ea9f02cc24a2293f12e5f49c040ab68ad809ba /extensions/components | |
| parent | 59d4ec416239be16376bd1f408e48e7a421665a2 (diff) | |
| download | chromium_src-ffe920cc73ea11dbfedfccad8c8af4478ba189bb.zip chromium_src-ffe920cc73ea11dbfedfccad8c8af4478ba189bb.tar.gz chromium_src-ffe920cc73ea11dbfedfccad8c8af4478ba189bb.tar.bz2 | |
Make getters of NativeAppWindowViews public
Remove AthenaNativeAppWindowViews
BUG=None
Review URL: https://codereview.chromium.org/721873007
Cr-Commit-Position: refs/heads/master@{#304150}
Diffstat (limited to 'extensions/components')
| -rw-r--r-- | extensions/components/native_app_window/native_app_window_views.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/components/native_app_window/native_app_window_views.h b/extensions/components/native_app_window/native_app_window_views.h index 7ca27eb..c8e84b4 100644 --- a/extensions/components/native_app_window/native_app_window_views.h +++ b/extensions/components/native_app_window/native_app_window_views.h @@ -54,19 +54,19 @@ class NativeAppWindowViews : public extensions::NativeAppWindow, // Signal that CanHaveTransparentBackground has changed. void OnCanHaveAlphaEnabledChanged(); - views::Widget* widget() { return widget_; } - - void set_window_for_testing(views::Widget* window) { widget_ = window; } - void set_web_view_for_testing(views::WebView* view) { web_view_ = view; } - - protected: extensions::AppWindow* app_window() { return app_window_; } const extensions::AppWindow* app_window() const { return app_window_; } + views::WebView* web_view() { return web_view_; } + const views::WebView* web_view() const { return web_view_; } + + views::Widget* widget() { return widget_; } const views::Widget* widget() const { return widget_; } - views::WebView* web_view() { return web_view_; } + void set_window_for_testing(views::Widget* window) { widget_ = window; } + void set_web_view_for_testing(views::WebView* view) { web_view_ = view; } + protected: // Initializes |widget_| for |app_window|. virtual void InitializeWindow( extensions::AppWindow* app_window, |