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

Unified Diff: chrome/browser/cocoa/clear_browsing_data_controller.mm

Issue 650124: Mac: Move prefs around in preparation for the content settings window. (Closed)
Patch Set: done? Created 10 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/clear_browsing_data_controller.mm
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.mm b/chrome/browser/cocoa/clear_browsing_data_controller.mm
index cc7bd927fb3a67ee3789f0ed529ba44d19e1b27b..a49c4dfff91b27bf82f626967a1a95067e8c8875 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller.mm
+++ b/chrome/browser/cocoa/clear_browsing_data_controller.mm
@@ -4,13 +4,17 @@
#import "chrome/browser/cocoa/clear_browsing_data_controller.h"
+#include "app/l10n_util.h"
#include "base/mac_util.h"
#include "base/scoped_nsobject.h"
#include "base/singleton.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_window.h"
#include "chrome/browser/browsing_data_remover.h"
#include "chrome/browser/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
+#include "grit/locale_settings.h"
NSString* const kClearBrowsingDataControllerDidDelete =
@"kClearBrowsingDataControllerDidDelete";
@@ -152,6 +156,18 @@ typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
[self closeDialog];
}
+// Called when the user clicks the "Flash Player storage settings" button.
+- (IBAction)openFlashPlayerSettings:(id)sender {
+ // The "Clear Data" dialog is app-modal on OS X. Hence, close it before
+ // opening a tab with flash settings.
+ [self closeDialog];
+
+ Browser* browser = Browser::Create(profile_);
viettrungluu 2010/02/22 00:57:40 Is this code common between platforms? Ought it no
+ browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)),
+ GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ browser->window()->Show();
+}
+
- (void)closeDialog {
ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
ProfileControllerMap::iterator it = map->find(profile_);

Powered by Google App Engine
This is Rietveld 408576698