| Index: chrome/browser/browser.cc
|
| ===================================================================
|
| --- chrome/browser/browser.cc (revision 23543)
|
| +++ chrome/browser/browser.cc (working copy)
|
| @@ -36,6 +36,7 @@
|
| #include "chrome/browser/sessions/session_types.h"
|
| #include "chrome/browser/sessions/tab_restore_service.h"
|
| #include "chrome/browser/status_bubble.h"
|
| +#include "chrome/browser/tab_contents/geoloc_infobar_delegate.h"
|
| #include "chrome/browser/tab_contents/interstitial_page.h"
|
| #include "chrome/browser/tab_contents/navigation_controller.h"
|
| #include "chrome/browser/tab_contents/navigation_entry.h"
|
| @@ -906,6 +907,7 @@
|
| }
|
|
|
| void Browser::BookmarkCurrentPage() {
|
| + /*
|
| UserMetrics::RecordAction(L"Star", profile_);
|
|
|
| TabContents* contents = GetSelectedTabContents();
|
| @@ -927,6 +929,9 @@
|
| // weird situations were the bubble is deleted as soon as it is shown.
|
| window_->ShowBookmarkBubble(url, was_bookmarked);
|
| }
|
| + */
|
| + TabContents* tab = GetSelectedTabContents();
|
| + tab->AddInfoBar(new GeolocInfoBarDelegate(tab));
|
| }
|
|
|
| void Browser::SavePage() {
|
| @@ -1222,6 +1227,11 @@
|
| }
|
| #endif
|
|
|
| +void Browser::OpenApiPermissionsPanel() {
|
| + UserMetrics::RecordAction(L"ApiPermissions", profile_);
|
| + window_->ShowApiPermissionsPanel();
|
| +}
|
| +
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| // static
|
| @@ -1437,6 +1447,7 @@
|
| #if defined(OS_CHROMEOS)
|
| case IDC_CONTROL_PANEL: ShowControlPanel(); break;
|
| #endif
|
| + case IDC_API_PERMISSIONS_PANEL: OpenApiPermissionsPanel(); break;
|
|
|
| default:
|
| LOG(WARNING) << "Received Unimplemented Command: " << id;
|
| @@ -2217,6 +2228,7 @@
|
| #if defined(OS_CHROMEOS)
|
| command_updater_.UpdateCommandEnabled(IDC_CONTROL_PANEL, true);
|
| #endif
|
| + command_updater_.UpdateCommandEnabled(IDC_API_PERMISSIONS_PANEL, true);
|
|
|
| // Initialize other commands based on the window type.
|
| {
|
|
|