diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 14:19:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 14:19:29 +0000 |
| commit | 7943f0d7b4f0b2866905c64f78d21651caab4a25 (patch) | |
| tree | d0ecadaec6e8421e041d4144c01e2eff319f29fa /ash/screensaver | |
| parent | e03b191b0957383da29b324639a4df84339a60a9 (diff) | |
| download | chromium_src-7943f0d7b4f0b2866905c64f78d21651caab4a25.zip chromium_src-7943f0d7b4f0b2866905c64f78d21651caab4a25.tar.gz chromium_src-7943f0d7b4f0b2866905c64f78d21651caab4a25.tar.bz2 | |
Begin to split ash into two libs - one with and one without a content dependency.
R=oshima@chromium.org
http://crbug.com/332504
Review URL: https://codereview.chromium.org/134333005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screensaver')
| -rw-r--r-- | ash/screensaver/screensaver_view.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/screensaver/screensaver_view.h b/ash/screensaver/screensaver_view.h index 2e27c4e..bf140fa 100644 --- a/ash/screensaver/screensaver_view.h +++ b/ash/screensaver/screensaver_view.h @@ -5,7 +5,7 @@ #ifndef ASH_SCREENSAVER_SCREENSAVER_VIEW_H_ #define ASH_SCREENSAVER_SCREENSAVER_VIEW_H_ -#include "ash/ash_export.h" +#include "ash/ash_with_content_export.h" #include "base/callback.h" #include "content/public/browser/web_contents_observer.h" #include "ui/views/widget/widget_delegate.h" @@ -25,9 +25,9 @@ namespace test { class ScreensaverViewTest; } -ASH_EXPORT void ShowScreensaver(const GURL& url); -ASH_EXPORT void CloseScreensaver(); -ASH_EXPORT bool IsScreensaverShown(); +ASH_WITH_CONTENT_EXPORT void ShowScreensaver(const GURL& url); +ASH_WITH_CONTENT_EXPORT void CloseScreensaver(); +ASH_WITH_CONTENT_EXPORT bool IsScreensaverShown(); typedef base::Callback<views::WebView*(content::BrowserContext*)> WebViewFactory; @@ -69,8 +69,8 @@ class ScreensaverView : public views::WidgetDelegateView, void ShowWindow(); // For testing purposes. - static ASH_EXPORT ScreensaverView* GetInstance(); - ASH_EXPORT bool IsScreensaverShowingURL(const GURL& url); + static ASH_WITH_CONTENT_EXPORT ScreensaverView* GetInstance(); + ASH_WITH_CONTENT_EXPORT bool IsScreensaverShowingURL(const GURL& url); // URL to show in the screensaver. GURL url_; |