diff options
| author | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 10:44:05 +0000 |
|---|---|---|
| committer | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 10:44:05 +0000 |
| commit | a34c8617c651247c665199d70a80f45591b68e6c (patch) | |
| tree | d60fc80edaf3af4eea92a8ddc33027fd19e35321 /apps/app_window_registry.h | |
| parent | 7011310bdcc948d5aa81e259f0a0a2acebd486e0 (diff) | |
| download | chromium_src-a34c8617c651247c665199d70a80f45591b68e6c.zip chromium_src-a34c8617c651247c665199d70a80f45591b68e6c.tar.gz chromium_src-a34c8617c651247c665199d70a80f45591b68e6c.tar.bz2 | |
Reland the rest of https://codereview.chromium.org/234673002/
This CL relands the rest of https://codereview.chromium.org/234673002/
following https://codereview.chromium.org/262633003/ and
removes the ChromeOS #ifdefs, effectively unreverting the revert.
This CL concludes the work required to merge
https://codereview.chromium.org/234673002/ into M35.
BUG=360896
TBR=stevenjb@chromium.org, skuhne@chromium.org
Review URL: https://codereview.chromium.org/266663004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_window_registry.h')
| -rw-r--r-- | apps/app_window_registry.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/app_window_registry.h b/apps/app_window_registry.h index 895bbe2..ebde350 100644 --- a/apps/app_window_registry.h +++ b/apps/app_window_registry.h @@ -37,14 +37,12 @@ class AppWindowRegistry : public KeyedService { virtual void OnAppWindowIconChanged(apps::AppWindow* app_window) = 0; // Called just after a app window was removed. virtual void OnAppWindowRemoved(apps::AppWindow* app_window) = 0; -#if defined(OS_CHROMEOS) // Called just after a app window was hidden. This is different from // window visibility as a minimize does not hide a window, but does make // it not visible. virtual void OnAppWindowHidden(apps::AppWindow* app_window); // Called just after a app window was shown. virtual void OnAppWindowShown(apps::AppWindow* app_window); -#endif protected: virtual ~Observer(); @@ -66,10 +64,8 @@ class AppWindowRegistry : public KeyedService { void AppWindowIconChanged(apps::AppWindow* app_window); // Called by |app_window| when it is activated. void AppWindowActivated(apps::AppWindow* app_window); -#if defined(OS_CHROMEOS) void AppWindowHidden(apps::AppWindow* app_window); void AppWindowShown(apps::AppWindow* app_window); -#endif void RemoveAppWindow(apps::AppWindow* app_window); void AddObserver(Observer* observer); |