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

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 cl issues 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

« chrome/browser/android/shortcut_data_fetcher.cc ('K') | « chrome/browser/android/shortcut_helper.cc ('k') | chrome/browser/android/shortcut_info.cc » ('j') | chrome/browser/android/shortcut_info.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 11 matching lines...) Expand all Loading...
22 SOURCE_UNKNOWN = 0,	22 SOURCE_UNKNOWN = 0,

23 SOURCE_ADD_TO_HOMESCREEN = 1,	23 SOURCE_ADD_TO_HOMESCREEN = 1,

24 SOURCE_APP_BANNER = 2,	24 SOURCE_APP_BANNER = 2,

25 SOURCE_BOOKMARK_NAVIGATOR_WIDGET = 3,	25 SOURCE_BOOKMARK_NAVIGATOR_WIDGET = 3,

26 SOURCE_BOOKMARK_SHORTCUT_WIDGET = 4,	26 SOURCE_BOOKMARK_SHORTCUT_WIDGET = 4,

27 SOURCE_COUNT = 5	27 SOURCE_COUNT = 5

28 };	28 };

29	29

30 ShortcutInfo();	30 ShortcutInfo();

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

	32 ~ShortcutInfo();
	gone 2015/07/20 22:19:12 1) ~ShortcutInfo() = default; 2) Remove empty dest 1) ~ShortcutInfo() = default; 2) Remove empty destructor from cc file Lalit Maganti 2015/07/21 09:07:27 Done. Show quoted text On 2015/07/20 at 22:19:12, dfalcantara wrote: > 1) ~ShortcutInfo() = default; > 2) Remove empty destructor from cc file Done. Lalit Maganti 2015/07/21 17:22:24 I've had to revert this because of chromium style Show quoted text On 2015/07/21 at 09:07:27, Lalit Maganti wrote: > On 2015/07/20 at 22:19:12, dfalcantara wrote: > > 1) ~ShortcutInfo() = default; > > 2) Remove empty destructor from cc file > > Done. I've had to revert this because of chromium style issues on Clang. See http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...
32	33

33 // Updates the info based on the given \|manifest\|.	34 // Updates the info based on the given \|manifest\|.

34 void UpdateFromManifest(const content::Manifest& manifest);	35 void UpdateFromManifest(const content::Manifest& manifest);

35	36

36 // Updates the source of the shortcut.	37 // Updates the source of the shortcut.

37 void UpdateSource(const Source source);	38 void UpdateSource(const Source source);

38	39

39 GURL url;	40 GURL url;

40 base::string16 title;	41 base::string16 user_title;

	42 base::string16 name;

	43 base::string16 short_name;

41 content::Manifest::DisplayMode display;	44 content::Manifest::DisplayMode display;

42 blink::WebScreenOrientationLockType orientation;	45 blink::WebScreenOrientationLockType orientation;

43 Source source;	46 Source source;

44 };	47 };

45	48

46 #endif // CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_	49 #endif // CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_

OLD	NEW