chrome/browser/ui/ash/chrome_launcher_prefs.cc - Issue 11570017: Enables storing shelf's auto_hide_behavior and alignment per display.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/ash/chrome_launcher_prefs.cc

Issue 11570017: Enables storing shelf's auto_hide_behavior and alignment per display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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

« ash/shell.cc ('K') | « ash/wm/app_list_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/ash/chrome_launcher_prefs.h"	5 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/values.h"	9 #include "base/values.h"

10 #include "chrome/browser/prefs/pref_service.h"	10 #include "chrome/browser/prefs/pref_service.h"

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 PrefService::UNSYNCABLE_PREF);	55 PrefService::UNSYNCABLE_PREF);

56 user_prefs->RegisterStringPref(prefs::kShelfAlignment,	56 user_prefs->RegisterStringPref(prefs::kShelfAlignment,

57 kShelfAlignmentBottom,	57 kShelfAlignmentBottom,

58 PrefService::SYNCABLE_PREF);	58 PrefService::SYNCABLE_PREF);

59 user_prefs->RegisterStringPref(prefs::kShelfAlignmentLocal,	59 user_prefs->RegisterStringPref(prefs::kShelfAlignmentLocal,

60 std::string(),	60 std::string(),

61 PrefService::UNSYNCABLE_PREF);	61 PrefService::UNSYNCABLE_PREF);

62 user_prefs->RegisterBooleanPref(prefs::kShowLogoutButtonInTray,	62 user_prefs->RegisterBooleanPref(prefs::kShowLogoutButtonInTray,

63 false,	63 false,

64 PrefService::UNSYNCABLE_PREF);	64 PrefService::UNSYNCABLE_PREF);

	65 user_prefs->RegisterDictionaryPref(prefs::kShelfPreferences,

	66 PrefService::UNSYNCABLE_PREF);

65 }	67 }

66	68

67 base::DictionaryValue* CreateAppDict(const std::string& app_id) {	69 base::DictionaryValue* CreateAppDict(const std::string& app_id) {

68 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);	70 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);

69 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id);	71 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id);

70 return app_value.release();	72 return app_value.release();

71 }	73 }

72	74

73 } // namespace ash	75 } // namespace ash

OLD	NEW