Support off the record content settings exceptions in DOM UI.

This adds the incognito exceptions in a separate table (ran this by ainslie). The second table will only show if an OTR session is active. This currently only works if you reopen the settings page after opening the OTR window (i.e. the settings page doesn't update as the OTR profile opens/closes, which actually matches the native dialogs).

BUG=48862
TEST=manual

Review URL: http://codereview.chromium.org/3398024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60670 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc
index 0ecc7ae..f257d1e0 100644
--- a/chrome/browser/dom_ui/dom_ui.cc
+++ b/chrome/browser/dom_ui/dom_ui.cc
@@ -97,6 +97,20 @@ void DOMUI::CallJavascriptFunction(
   ExecuteJavascript(GetJavascript(function_name, args));
 }
 
+void DOMUI::CallJavascriptFunction(
+    const std::wstring& function_name,
+    const Value& arg1,
+    const Value& arg2,
+    const Value& arg3,
+    const Value& arg4) {
+  std::vector<const Value*> args;
+  args.push_back(&arg1);
+  args.push_back(&arg2);
+  args.push_back(&arg3);
+  args.push_back(&arg4);
+  ExecuteJavascript(GetJavascript(function_name, args));
+}
+
 ThemeProvider* DOMUI::GetThemeProvider() const {
   return tab_contents_->profile()->GetThemeProvider();
 }