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

Side by Side Diff: chrome/browser/android/preferences/website_preference_bridge.cc

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
« no previous file with comments | « chrome/android/java/res/xml/content_preferences.xml ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "chrome/browser/android/preferences/website_preference_bridge.h" 5 #include "chrome/browser/android/preferences/website_preference_bridge.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 Java_WebsitePreferenceBridge_insertProtectedMediaIdentifierInfoIntoList( 107 Java_WebsitePreferenceBridge_insertProtectedMediaIdentifierInfoIntoList(
108 env, list, jorigin.obj(), jembedder.obj()); 108 env, list, jorigin.obj(), jembedder.obj());
109 break; 109 break;
110 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 110 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
111 Java_WebsitePreferenceBridge_insertPushNotificationIntoList( 111 Java_WebsitePreferenceBridge_insertPushNotificationIntoList(
112 env, list, jorigin.obj(), jembedder.obj()); 112 env, list, jorigin.obj(), jembedder.obj());
113 break; 113 break;
114 case CONTENT_SETTINGS_TYPE_FULLSCREEN: 114 case CONTENT_SETTINGS_TYPE_FULLSCREEN:
115 Java_WebsitePreferenceBridge_insertFullscreenInfoIntoList( 115 Java_WebsitePreferenceBridge_insertFullscreenInfoIntoList(
116 env, list, jorigin.obj(), jembedder.obj()); 116 env, list, jorigin.obj(), jembedder.obj());
117 break;
117 default: 118 default:
118 DCHECK(false); 119 DCHECK(false);
119 break; 120 break;
120 } 121 }
121 } 122 }
122 } 123 }
123 124
124 static jint GetSettingForOrigin(JNIEnv* env, 125 static jint GetSettingForOrigin(JNIEnv* env,
125 ContentSettingsType content_type, 126 ContentSettingsType content_type,
126 jstring origin, 127 jstring origin,
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 GURL url(ConvertJavaStringToUTF8(env, jorigin)); 687 GURL url(ConvertJavaStringToUTF8(env, jorigin));
687 scoped_refptr<SiteDataDeleteHelper> site_data_deleter( 688 scoped_refptr<SiteDataDeleteHelper> site_data_deleter(
688 new SiteDataDeleteHelper(profile, url)); 689 new SiteDataDeleteHelper(profile, url));
689 site_data_deleter->Run(); 690 site_data_deleter->Run();
690 } 691 }
691 692
692 // Register native methods 693 // Register native methods
693 bool RegisterWebsitePreferenceBridge(JNIEnv* env) { 694 bool RegisterWebsitePreferenceBridge(JNIEnv* env) {
694 return RegisterNativesImpl(env); 695 return RegisterNativesImpl(env);
695 } 696 }
OLDNEW
« no previous file with comments | « chrome/android/java/res/xml/content_preferences.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698