Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Side by Side Diff: chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc

Issue 10273012: ash: Fix shelf auto hide behavior not persisted regression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher_context_menu_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h" 5 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
6 6
7 #include "ash/launcher/launcher_context_menu.h" 7 #include "ash/launcher/launcher_context_menu.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" 10 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 case LAUNCH_TYPE_REGULAR_TAB: 110 case LAUNCH_TYPE_REGULAR_TAB:
111 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_REGULAR); 111 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_REGULAR);
112 break; 112 break;
113 case LAUNCH_TYPE_WINDOW: 113 case LAUNCH_TYPE_WINDOW:
114 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_WINDOW); 114 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_WINDOW);
115 break; 115 break;
116 case LAUNCH_TYPE_FULLSCREEN: 116 case LAUNCH_TYPE_FULLSCREEN:
117 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_FULLSCREEN); 117 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_FULLSCREEN);
118 break; 118 break;
119 case MENU_AUTO_HIDE: 119 case MENU_AUTO_HIDE:
120 ash::LauncherContextMenu::ToggleAutoHideMenu(); 120 delegate_->SetAutoHideBehavior(
121 ash::LauncherContextMenu::GetToggledAutoHideBehavior());
121 break; 122 break;
122 case MENU_NEW_WINDOW: 123 case MENU_NEW_WINDOW:
123 delegate_->CreateNewWindow(); 124 delegate_->CreateNewWindow();
124 break; 125 break;
125 case MENU_NEW_INCOGNITO_WINDOW: 126 case MENU_NEW_INCOGNITO_WINDOW:
126 delegate_->CreateNewIncognitoWindow(); 127 delegate_->CreateNewIncognitoWindow();
127 break; 128 break;
128 } 129 }
129 } 130 }
OLDNEW
« no previous file with comments | « ash/launcher/launcher_context_menu_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698