summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-10 01:04:19 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-10 01:04:19 +0000
commitb2df464d2783521f8fabbbe76f74a4129dd8417e (patch)
tree82887ecc3529d0c0a99772fe5fc3c6dfa9c01e2f /chrome/browser/first_run
parentfab037936bbbd1085c80e38b7a675e50105bb981 (diff)
downloadchromium_src-b2df464d2783521f8fabbbe76f74a4129dd8417e.zip
chromium_src-b2df464d2783521f8fabbbe76f74a4129dd8417e.tar.gz
chromium_src-b2df464d2783521f8fabbbe76f74a4129dd8417e.tar.bz2
Content settings: generalize the exceptions lists for all settings types.
BUG=48862 TEST=exceptions lists work for types besides images Review URL: http://codereview.chromium.org/3035060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
-rw-r--r--chrome/browser/first_run/first_run_gtk.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc
index cd32cec..725cdd0 100644
--- a/chrome/browser/first_run/first_run_gtk.cc
+++ b/chrome/browser/first_run/first_run_gtk.cc
@@ -22,7 +22,10 @@
#include "chrome/installer/util/util_constants.h"
#include "googleurl/src/gurl.h"
-bool OpenFirstRunDialog(Profile* profile, bool homepage_defined,
+// TODO(estade): pay attention to the args between |profile| and
+// |process_singleton|.
+bool OpenFirstRunDialog(Profile* profile,
+ bool homepage_defined,
int import_items,
int dont_import_items,
bool search_engine_experiment,