Merge 69758 - Do not show apps section until default apps are installed....

chrome/browser/extensions/default_apps.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_DEFAULT_APPS_H_
 #define CHROME_BROWSER_EXTENSIONS_DEFAULT_APPS_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 28 matching lines @@
   explicit DefaultApps(PrefService* prefs);
   ~DefaultApps();
 
   // Gets the list of default apps that should be installed. Can return NULL if
   // no apps need to be installed.
   const ExtensionIdSet* GetAppsToInstall() const;
 
   // Gets the list of default apps.
   const ExtensionIdSet* GetDefaultApps() const;
 
+  // Returns true if the default apps have been installed. False otherwise.
+  bool GetDefaultAppsInstalled() const;
+
   // Should be called after each app is installed. Once installed_ids contains
   // all the default apps, GetAppsToInstall() will start returning NULL.
   void DidInstallApp(const ExtensionIdSet& installed_ids);
 
   // Returns true if the apps promo should be displayed in the launcher.
   //
   // NOTE: If the default apps have been installed, but |installed_ids| is
   // different than GetDefaultApps(), this will permanently expire the promo.
   bool CheckShouldShowPromo(const ExtensionIdSet& installed_ids);
 
   // Should be called after each time the promo is installed.
   void DidShowPromo();
 
   // Force the promo to be hidden.
   void SetPromoHidden();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtensionDefaultApps, Basics);
   FRIEND_TEST_ALL_PREFIXES(ExtensionDefaultApps, HidePromo);
   FRIEND_TEST_ALL_PREFIXES(ExtensionDefaultApps, InstallingAnAppHidesPromo);
   FRIEND_TEST_ALL_PREFIXES(ExtensionDefaultApps,
                            ManualAppInstalledWhileInstallingDefaultApps);
 
-  bool GetDefaultAppsInstalled() const;
   void SetDefaultAppsInstalled(bool val);
 
   int GetPromoCounter() const;
   void SetPromoCounter(int val);
 
   // Our permanent state is stored in this PrefService instance.
   PrefService* prefs_;
 
   // The set of default extensions. Initialized to a static list in the
   // constructor.
   ExtensionIdSet ids_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultApps);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_DEFAULT_APPS_H_