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

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

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 8 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
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.cc » ('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 #ifndef CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shelf/shelf_types.h"
11
10 namespace base { 12 namespace base {
11 class DictionaryValue; 13 class DictionaryValue;
12 } 14 }
13 15
14 namespace user_prefs { 16 namespace user_prefs {
15 class PrefRegistrySyncable; 17 class PrefRegistrySyncable;
16 } 18 }
17 19
18 namespace ash { 20 namespace ash {
19 21
(...skipping 10 matching lines...) Expand all
30 // Values used for prefs::kShelfAlignment. 32 // Values used for prefs::kShelfAlignment.
31 extern const char kShelfAlignmentBottom[]; 33 extern const char kShelfAlignmentBottom[];
32 extern const char kShelfAlignmentLeft[]; 34 extern const char kShelfAlignmentLeft[];
33 extern const char kShelfAlignmentRight[]; 35 extern const char kShelfAlignmentRight[];
34 36
35 void RegisterChromeLauncherUserPrefs( 37 void RegisterChromeLauncherUserPrefs(
36 user_prefs::PrefRegistrySyncable* registry); 38 user_prefs::PrefRegistrySyncable* registry);
37 39
38 base::DictionaryValue* CreateAppDict(const std::string& app_id); 40 base::DictionaryValue* CreateAppDict(const std::string& app_id);
39 41
42 ash::ShelfAlignment AlignmentFromPref(const std::string& value);
43 const char* AlignmentToPref(ash::ShelfAlignment alignment);
44
45 ash::ShelfAutoHideBehavior AutoHideBehaviorFromPref(const std::string& value);
46 const char* AutoHideBehaviorToPref(ash::ShelfAutoHideBehavior behavior);
47
40 } // namespace ash 48 } // namespace ash
41 49
42 #endif // CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_ 50 #endif // CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698