chrome/browser/android/shortcut_info.h - Issue 1224273003: webapps: propogate name and shortName from manifest to Java

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/android/shortcut_info.h

Issue 1224273003: webapps: propogate name and shortName from manifest to Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test compile on Android Created 5 years, 5 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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_ANDROID_SHORTCUT_INFO_H_	5 #ifndef CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_

6 #define CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_	6 #define CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_

7	7

8 #include "base/strings/string16.h"	8 #include "base/strings/string16.h"

9 #include "content/public/common/manifest.h"	9 #include "content/public/common/manifest.h"

10 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h"	10 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h"

(...skipping 14 matching lines...) Expand all Loading...
25 ShortcutInfo();	25 ShortcutInfo();

26 explicit ShortcutInfo(const GURL& shortcut_url);	26 explicit ShortcutInfo(const GURL& shortcut_url);

27	27

28 // Updates the info based on the given \|manifest\|.	28 // Updates the info based on the given \|manifest\|.

29 void UpdateFromManifest(const content::Manifest& manifest);	29 void UpdateFromManifest(const content::Manifest& manifest);

30	30

31 // Updates the source of the shortcut.	31 // Updates the source of the shortcut.

32 void UpdateSource(const Source source);	32 void UpdateSource(const Source source);

33	33

34 GURL url;	34 GURL url;

35 base::string16 title;	35 base::string16 user_title;

	36 base::string16 name;

	37 base::string16 short_name;

36 content::Manifest::DisplayMode display;	38 content::Manifest::DisplayMode display;

37 blink::WebScreenOrientationLockType orientation;	39 blink::WebScreenOrientationLockType orientation;

38 Source source;	40 Source source;

39 };	41 };

40	42

41 #endif // CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_	43 #endif // CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_

OLD	NEW