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

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

Issue 1313533003: Fix some extern usage in .cc files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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/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/common/extensions/extension_constants.h" 10 #include "chrome/common/extensions/extension_constants.h"
(...skipping 20 matching lines...) Expand all
31 31
32 } // namespace 32 } // namespace
33 33
34 namespace ash { 34 namespace ash {
35 35
36 const char kPinnedAppsPrefAppIDPath[] = "id"; 36 const char kPinnedAppsPrefAppIDPath[] = "id";
37 37
38 const char kShelfAutoHideBehaviorAlways[] = "Always"; 38 const char kShelfAutoHideBehaviorAlways[] = "Always";
39 const char kShelfAutoHideBehaviorNever[] = "Never"; 39 const char kShelfAutoHideBehaviorNever[] = "Never";
40 40
41 extern const char kShelfAlignmentBottom[] = "Bottom"; 41 const char kShelfAlignmentBottom[] = "Bottom";
42 extern const char kShelfAlignmentLeft[] = "Left"; 42 const char kShelfAlignmentLeft[] = "Left";
43 extern const char kShelfAlignmentRight[] = "Right"; 43 const char kShelfAlignmentRight[] = "Right";
44 extern const char kShelfAlignmentTop[] = "Top"; 44 const char kShelfAlignmentTop[] = "Top";
45 45
46 void RegisterChromeLauncherUserPrefs( 46 void RegisterChromeLauncherUserPrefs(
47 user_prefs::PrefRegistrySyncable* registry) { 47 user_prefs::PrefRegistrySyncable* registry) {
48 // TODO: If we want to support multiple profiles this will likely need to be 48 // TODO: If we want to support multiple profiles this will likely need to be
49 // pushed to local state and we'll need to track profile per item. 49 // pushed to local state and we'll need to track profile per item.
50 registry->RegisterIntegerPref( 50 registry->RegisterIntegerPref(
51 prefs::kShelfChromeIconIndex, 51 prefs::kShelfChromeIconIndex,
52 0, 52 0,
53 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 53 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
54 registry->RegisterListPref(prefs::kPinnedLauncherApps, 54 registry->RegisterListPref(prefs::kPinnedLauncherApps,
(...skipping 13 matching lines...) Expand all
68 registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray, false); 68 registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray, false);
69 } 69 }
70 70
71 base::DictionaryValue* CreateAppDict(const std::string& app_id) { 71 base::DictionaryValue* CreateAppDict(const std::string& app_id) {
72 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue); 72 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);
73 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id); 73 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id);
74 return app_value.release(); 74 return app_value.release();
75 } 75 }
76 76
77 } // namespace ash 77 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698