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

Side by Side Diff: chrome/browser/geolocation/geolocation_confirm_infobar_delegate_android.cc

Issue 11186010: Update geolocation infobar to handle Android system settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Failed to upload Created 8 years, 1 month 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 | Annotate | Revision Log
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 #include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate_androi d.h" 5 #include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate_androi d.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/android/google_location_settings_helper.h"
8 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
9 #include "grit/locale_settings.h" 10 #include "grit/locale_settings.h"
10 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
11 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
12 13
13 GeolocationConfirmInfoBarDelegateAndroid:: 14 GeolocationConfirmInfoBarDelegateAndroid::
14 GeolocationConfirmInfoBarDelegateAndroid( 15 GeolocationConfirmInfoBarDelegateAndroid(
15 InfoBarTabHelper* infobar_helper, 16 InfoBarTabHelper* infobar_helper,
16 GeolocationInfoBarQueueController* controller, 17 GeolocationInfoBarQueueController* controller,
17 int render_process_id, 18 int render_process_id,
18 int render_view_id, 19 int render_view_id,
19 int bridge_id, 20 int bridge_id,
20 const GURL& requesting_frame_url, 21 const GURL& requesting_frame_url,
21 const std::string& display_languages) 22 const std::string& display_languages)
22 : GeolocationConfirmInfoBarDelegate(infobar_helper, 23 : GeolocationConfirmInfoBarDelegate(infobar_helper,
23 controller, 24 controller,
24 render_process_id, 25 render_process_id,
25 render_view_id, 26 render_view_id,
26 bridge_id, 27 bridge_id,
27 requesting_frame_url, 28 requesting_frame_url,
28 display_languages) { 29 display_languages),
30 google_location_settings_helper_(new GoogleLocationSettingsHelper()) {
31 }
32
33 GeolocationConfirmInfoBarDelegateAndroid::
34 ~GeolocationConfirmInfoBarDelegateAndroid() {
35 }
36
37 bool GeolocationConfirmInfoBarDelegateAndroid::Accept() {
38 // Accept button text could be either 'Allow' or 'Google Location Settings'.
39 // If 'Allow' we follow the regular flow.
40 if (google_location_settings_helper_->IsGoogleAppsLocationSettingEnabled())
41 return GeolocationConfirmInfoBarDelegate::Accept();
42
43 // If 'Google Location Settings', we need to open the system Google Location
44 // Settings activity.
45 google_location_settings_helper_->ShowGoogleLocationSettings();
46 SetPermission(false, false);
47 return true;
29 } 48 }
30 49
31 string16 GeolocationConfirmInfoBarDelegateAndroid::GetButtonLabel( 50 string16 GeolocationConfirmInfoBarDelegateAndroid::GetButtonLabel(
32 InfoBarButton button) const { 51 InfoBarButton button) const {
33 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? 52 if (button == BUTTON_OK) {
34 IDS_GEOLOCATION_ALLOW_BUTTON : IDS_GEOLOCATION_DENY_BUTTON); 53 return UTF8ToUTF16(
54 google_location_settings_helper_->GetAcceptButtonLabel());
55 }
56 return l10n_util::GetStringUTF16(IDS_GEOLOCATION_DENY_BUTTON);
35 } 57 }
OLDNEW
« no previous file with comments | « chrome/browser/geolocation/geolocation_confirm_infobar_delegate_android.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698