chrome/android/java/res/xml/content_preferences.xml - Issue 1044883002: Fix DCHECK and positioning for FullScreen within the Site Settings menu.

Side by Side Diff: chrome/android/java/res/xml/content_preferences.xml

Issue 1044883002: Fix DCHECK and positioning for FullScreen within the Site Settings menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't show the FullScreen entry on Site Details page Created 5 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

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">	6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

7 <!-- All sites -->	7 <!-- All sites -->

8 <Preference	8 <Preference

9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"	9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

10 android:key="website_settings"	10 android:key="website_settings"

(...skipping 16 matching lines...) Expand all Loading...
27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"	27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

28 android:key="push_notifications" />	28 android:key="push_notifications" />

29 <!-- JavaScript -->	29 <!-- JavaScript -->

30 <Preference	30 <Preference

31 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"	31 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

32 android:key="javascript" />	32 android:key="javascript" />

33 <!-- Popups -->	33 <!-- Popups -->

34 <Preference	34 <Preference

35 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"	35 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

36 android:key="popups" />	36 android:key="popups" />

	37 <!-- Fullscreen -->

	38 <Preference

	39 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	40 android:key="fullscreen" />

37 <!-- Protected content -->	41 <!-- Protected content -->

38 <Preference	42 <Preference

39 android:fragment="org.chromium.chrome.browser.preferences.ProtectedConte ntPreferences"	43 android:fragment="org.chromium.chrome.browser.preferences.ProtectedConte ntPreferences"

40 android:key="protected_content" />	44 android:key="protected_content" />

41 <!-- Google Translate -->	45 <!-- Google Translate -->

42 <Preference	46 <Preference

43 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences"	47 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences"

44 android:key="translate"	48 android:key="translate"

45 android:title="@string/google_translate"	49 android:title="@string/google_translate"

46 android:icon="@drawable/settings_translate" />	50 android:icon="@drawable/settings_translate" />

47 <!-- Storage -->	51 <!-- Storage -->

48 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->	52 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->

49 <Preference	53 <Preference

50 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"	54 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

51 android:key="use_storage"	55 android:key="use_storage"

52 android:title="@string/website_settings_storage"	56 android:title="@string/website_settings_storage"

53 android:icon="@drawable/settings_storage" />	57 android:icon="@drawable/settings_storage" />

54 <!-- Fullscreen -->

55 <Preference

56 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

57 android:key="fullscreen" />

58 </PreferenceScreen>	58 </PreferenceScreen>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/android/preferences/website_preference_bridge.cc » ('j') | no next file with comments »