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

3 files changed, 5 insertions, 19 deletions

diff --git a/apps/app_window.cc b/apps/app_window.cc
index 5c91b5c..a48f79d 100644
--- a/apps/app_window.cc
+++ b/apps/app_window.cc
@@ -279,16 +279,14 @@ void AppWindow::Init(const GURL& url,
 
   native_app_window_.reset(delegate_->CreateNativeAppWindow(this, new_params));
 
-  if (!new_params.hidden) {
-    // Panels are not activated by default.
-    Show(window_type_is_panel() || !new_params.focused ? SHOW_INACTIVE
-                                                       : SHOW_ACTIVE);
-#if defined(OS_CHROMEOS)
-  } else {
+  if (new_params.hidden) {
     // Although the window starts hidden by default, calling Hide() here
     // notifies observers of the window being hidden.
     Hide();
-#endif
+  } else {
+    // Panels are not activated by default.
+    Show(window_type_is_panel() || !new_params.focused ? SHOW_INACTIVE
+                                                       : SHOW_ACTIVE);
   }
 
   if (new_params.state == ui::SHOW_STATE_FULLSCREEN)
@@ -698,9 +696,7 @@ void AppWindow::Show(ShowType show_type) {
       GetBaseWindow()->ShowInactive();
       break;
   }
-#if defined(OS_CHROMEOS)
   AppWindowRegistry::Get(browser_context_)->AppWindowShown(this);
-#endif
 }
 
 void AppWindow::Hide() {
@@ -710,9 +706,7 @@ void AppWindow::Hide() {
   // show will not be delayed.
   show_on_first_paint_ = false;
   GetBaseWindow()->Hide();
-#if defined(OS_CHROMEOS)
   AppWindowRegistry::Get(browser_context_)->AppWindowHidden(this);
-#endif
 }
 
 void AppWindow::SetAlwaysOnTop(bool always_on_top) {
diff --git a/apps/app_window_registry.cc b/apps/app_window_registry.cc
index b2f9a44..322ece9 100644
--- a/apps/app_window_registry.cc
+++ b/apps/app_window_registry.cc
@@ -45,13 +45,11 @@ std::string GetWindowKeyForRenderViewHost(
 
 namespace apps {
 
-#if defined(OS_CHROMEOS)
 void AppWindowRegistry::Observer::OnAppWindowHidden(AppWindow* app_window) {
 }
 
 void AppWindowRegistry::Observer::OnAppWindowShown(AppWindow* app_window) {
 }
-#endif
 
 AppWindowRegistry::Observer::~Observer() {
 }
@@ -88,7 +86,6 @@ void AppWindowRegistry::AppWindowActivated(AppWindow* app_window) {
   BringToFront(app_window);
 }
 
-#if defined(OS_CHROMEOS)
 void AppWindowRegistry::AppWindowHidden(AppWindow* app_window) {
   FOR_EACH_OBSERVER(Observer, observers_, OnAppWindowHidden(app_window));
 }
@@ -96,7 +93,6 @@ void AppWindowRegistry::AppWindowHidden(AppWindow* app_window) {
 void AppWindowRegistry::AppWindowShown(AppWindow* app_window) {
   FOR_EACH_OBSERVER(Observer, observers_, OnAppWindowShown(app_window));
 }
-#endif
 
 void AppWindowRegistry::RemoveAppWindow(AppWindow* app_window) {
   const AppWindowList::iterator it =
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);