Revert of AutoHide Behavior

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright (c) 2012 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/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <set>
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
@@ skipping 464 matching lines @@
   const PrefService::Preference* pref =
       profile_->GetPrefs()->FindPreference(prefs::kPinnedLauncherApps);
   return pref && pref->IsUserModifiable();
 }
 
 void ChromeLauncherController::SetAutoHideBehavior(
     ash::ShelfAutoHideBehavior behavior) {
   ash::Shell::GetInstance()->SetShelfAutoHideBehavior(behavior);
   const char* value = NULL;
   switch (behavior) {
+    case ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT:
+      value = ash::kShelfAutoHideBehaviorDefault;
+      break;
     case ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS:
       value = ash::kShelfAutoHideBehaviorAlways;
       break;
     case ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER:
       value = ash::kShelfAutoHideBehaviorNever;
       break;
   }
   profile_->GetPrefs()->SetString(prefs::kShelfAutoHideBehavior, value);
 }
 
@@ skipping 347 matching lines @@
     else
       ++index;
   }
 
   // Append unprocessed items from the pref to the end of the model.
   for (; pref_app_id != pinned_apps.end(); ++pref_app_id)
     DoPinAppWithID(*pref_app_id);
 }
 
 void ChromeLauncherController::SetShelfAutoHideBehaviorFromPrefs() {
-  // Note: To maintain sync compatibility with old images of chrome/chromeos
-  // the set of values that may be encountered includes the now-extinct
-  // "Default" as well as "Never" and "Always", "Default" should now
-  // be treated as "Never".
-  // (http://code.google.com/p/chromium/issues/detail?id=146773)
   const std::string behavior_value(
       profile_->GetPrefs()->GetString(prefs::kShelfAutoHideBehavior));
   ash::ShelfAutoHideBehavior behavior =
-      ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
-  if (behavior_value == ash::kShelfAutoHideBehaviorAlways)
+      ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT;
+  if (behavior_value == ash::kShelfAutoHideBehaviorNever)
+    behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
+  else if (behavior_value == ash::kShelfAutoHideBehaviorAlways)
     behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
   ash::Shell::GetInstance()->SetShelfAutoHideBehavior(behavior);
 }
 
 void ChromeLauncherController::SetShelfAlignmentFromPrefs() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kShowLauncherAlignmentMenu))
     return;
 
   const std::string alignment_value(
@@ skipping 109 matching lines @@
   if (current_tab) {
     content::NavigationEntry* active_entry =
         current_tab->GetController().GetActiveEntry();
     if (active_entry &&
         active_entry->GetURL() == GURL(chrome::kChromeUINewTabURL))
       return true;
   }
   return false;
 }