Chromium Code Reviews| Index: chrome/browser/ui/cocoa/browser_window_command_handler.mm |
| diff --git a/chrome/browser/ui/cocoa/browser_window_command_handler.mm b/chrome/browser/ui/cocoa/browser_window_command_handler.mm |
| index 9b54b8224cd111f3d43126805e7a658ab09f407d..295e022955571cbf56ec812a40bae7ed0e1893d4 100644 |
| --- a/chrome/browser/ui/cocoa/browser_window_command_handler.mm |
| +++ b/chrome/browser/ui/cocoa/browser_window_command_handler.mm |
| @@ -55,7 +55,18 @@ void UpdateToggleStateWithTag(NSInteger tag, id item, NSWindow* window) { |
| if (tag == IDC_TOGGLE_FULLSCREEN_TOOLBAR) { |
| PrefService* prefs = browser->profile()->GetPrefs(); |
| - SetToggleState(prefs->GetBoolean(prefs::kHideFullscreenToolbar), item); |
| + |
| + // Migrate the value of kHideFullscreenToolbar to kShowFullscreenToolbar if |
|
msw
2016/03/01 00:08:51
Do we only migrate when the user toggles the value
spqchan
2016/03/01 17:50:18
No, this is called when the menu is created. The m
|
| + // it was set by the user. See crbug.com/590827. |
| + const PrefService::Preference* hide_pref = |
| + prefs->FindPreference(prefs::kHideFullscreenToolbar); |
| + if (!hide_pref->IsDefaultValue()) { |
| + bool hide_pref_value = prefs->GetBoolean(prefs::kHideFullscreenToolbar); |
| + prefs->SetBoolean(prefs::kShowFullscreenToolbar, !hide_pref_value); |
| + prefs->ClearPref(prefs::kHideFullscreenToolbar); |
| + } |
| + |
| + SetToggleState(prefs->GetBoolean(prefs::kShowFullscreenToolbar), item); |
| return; |
| } |