Make sure the app section opens whenever a new apps is

chrome/browser/dom_ui/shown_sections_handler.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/shown_sections_handler.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_details.h"
+#include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // Will cause an UMA notification if the mode of the new tab page
 // was changed to hide/show the most visited thumbnails.
 // TODO(aa): Needs to be updated to match newest NTP - http://crbug.com/57440
 void NotifySectionDisabled(int new_mode, int old_mode, Profile *profile) {
   // If the oldmode HAD either thumbs or lists visible.
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 // static
 int ShownSectionsHandler::GetShownSections(PrefService* prefs) {
   return prefs->GetInteger(prefs::kNTPShownSections);
 }
 
 ShownSectionsHandler::ShownSectionsHandler(PrefService* pref_service)
     : pref_service_(pref_service) {
-  registrar_.Init(pref_service);
-  registrar_.Add(prefs::kNTPShownSections, this);
+  pref_registrar_.Init(pref_service);
+  pref_registrar_.Add(prefs::kNTPShownSections, this);
 }
 
 void ShownSectionsHandler::RegisterMessages() {
+  notification_registrar_.Add(this, NotificationType::EXTENSION_INSTALLED,
+                              Source<Profile>(dom_ui_->GetProfile()));
+
   dom_ui_->RegisterMessageCallback("getShownSections",
       NewCallback(this, &ShownSectionsHandler::HandleGetShownSections));
   dom_ui_->RegisterMessageCallback("setShownSections",
       NewCallback(this, &ShownSectionsHandler::HandleSetShownSections));
 }
 
 void ShownSectionsHandler::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
-  DCHECK(NotificationType::PREF_CHANGED == type);
-  std::string* pref_name = Details<std::string>(details).ptr();
-  DCHECK(*pref_name == prefs::kNTPShownSections);
+  if (type == NotificationType::PREF_CHANGED) {
+    std::string* pref_name = Details<std::string>(details).ptr();
+    DCHECK(*pref_name == prefs::kNTPShownSections);
+    int sections = pref_service_->GetInteger(prefs::kNTPShownSections);
+    FundamentalValue sections_value(sections);
+    dom_ui_->CallJavascriptFunction(L"setShownSections", sections_value);
+  } else if (type == NotificationType::EXTENSION_INSTALLED) {
+    if (Details<const Extension>(details).ptr()->is_app()) {
+      int mode = pref_service_->GetInteger(prefs::kNTPShownSections);
 
-  int sections = pref_service_->GetInteger(prefs::kNTPShownSections);
-  FundamentalValue sections_value(sections);
-  dom_ui_->CallJavascriptFunction(L"setShownSections", sections_value);
+      // De-minimize the apps section.
+      mode &= ~MINIMIZED_APPS;
+
+      // Hide any open sections.

[Erik does not do reviews, 2010/11/04 23:40:39]

Shouldn't this be "minimize" rather than "hide"?  Or maybe I'm confused by the
use of these two words here.

[Aaron Boodman, 2010/11/05 00:08:34]

The nomenclature in NTP is all messed up. We unfortunately use "minimize" for
"hit the x in the right top corner", which causes lots of awkwardness.

+      mode &= ~ALL_SECTIONS_MASK;
+
+      // Show the apps section.
+      mode |= APPS;
+
+      pref_service_->SetInteger(prefs::kNTPShownSections, mode);
+    }
+  } else {
+    NOTREACHED();
+  }
 }
 
 void ShownSectionsHandler::HandleGetShownSections(const ListValue* args) {
   int sections = GetShownSections(pref_service_);
   FundamentalValue sections_value(sections);
   dom_ui_->CallJavascriptFunction(L"onShownSections", sections_value);
 }
 
 void ShownSectionsHandler::HandleSetShownSections(const ListValue* args) {
   int mode;
@@ skipping 26 matching lines @@
       shown_sections = APPS;
     else
       shown_sections = THUMB;
 
     changed = true;
   }
 
   if (changed)
     pref_service->SetInteger(prefs::kNTPShownSections, shown_sections);
 }