From 0c6d1f3a86e5ab7a4a00ab2a2f0cac99d78fc99f Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Fri, 16 Nov 2012 13:34:34 -0800
Subject: [PATCH] Bug 806929: "Open in new private tab" for awesomebar entries.
 [r=mfinkle]

--HG--
extra : rebase_source : 230d2b3703f74ab6e585f4a528c1974f4259b709
---
 mobile/android/base/AwesomeBar.java                      | 9 +++++++--
 mobile/android/base/locales/en-US/android_strings.dtd    | 1 +
 .../base/resources/menu/awesomebar_contextmenu.xml       | 3 +++
 mobile/android/base/strings.xml.in                       | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index 6c3e018dd2a2..bf43e5062c65 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -536,7 +536,8 @@ public class AwesomeBar extends GeckoActivity {
         final int display = mContextMenuSubject.display;
 
         switch (item.getItemId()) {
-            case R.id.open_new_tab: {
+            case R.id.open_new_tab:
+            case R.id.open_new_private_tab: {
                 if (url == null) {
                     Log.e(LOGTAG, "Can't open in new tab because URL is null");
                     break;
@@ -546,7 +547,11 @@ public class AwesomeBar extends GeckoActivity {
                 if (display == Combined.DISPLAY_READER)
                     newTabUrl = ReaderModeUtils.getAboutReaderForUrl(url, true);
 
-                Tabs.getInstance().loadUrl(newTabUrl, Tabs.LOADURL_NEW_TAB);
+                int flags = Tabs.LOADURL_NEW_TAB;
+                if (item.getItemId() == R.id.open_new_private_tab)
+                    flags |= Tabs.LOADURL_PRIVATE;
+
+                Tabs.getInstance().loadUrl(newTabUrl, flags);
                 Toast.makeText(this, R.string.new_tab_opened, Toast.LENGTH_SHORT).show();
                 break;
             }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index a29622a92869..a14de61497e2 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -148,6 +148,7 @@ size. -->
 <!ENTITY find_close "Close">
 
 <!ENTITY contextmenu_open_new_tab "Open in New Tab">
+<!ENTITY contextmenu_open_new_private_tab "Open in New Private Tab">
 <!ENTITY contextmenu_open_in_reader "Open in Reader">
 <!ENTITY contextmenu_remove_history "Remove">
 <!ENTITY contextmenu_remove_bookmark "Remove">
diff --git a/mobile/android/base/resources/menu/awesomebar_contextmenu.xml b/mobile/android/base/resources/menu/awesomebar_contextmenu.xml
index 26f8fec63674..c086aed7815e 100644
--- a/mobile/android/base/resources/menu/awesomebar_contextmenu.xml
+++ b/mobile/android/base/resources/menu/awesomebar_contextmenu.xml
@@ -8,6 +8,9 @@
     <item android:id="@+id/open_new_tab"
           android:title="@string/contextmenu_open_new_tab"/>
 
+    <item android:id="@+id/open_new_private_tab"
+          android:title="@string/contextmenu_open_new_private_tab"/>
+
     <item android:id="@+id/open_in_reader"
           android:title="@string/contextmenu_open_in_reader"/>
 
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 2ae648a743f5..8a83491a96b5 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -158,6 +158,7 @@
   <string name="reader">&reader;</string>
 
   <string name="contextmenu_open_new_tab">&contextmenu_open_new_tab;</string>
+  <string name="contextmenu_open_new_private_tab">&contextmenu_open_new_private_tab;</string>
   <string name="contextmenu_open_in_reader">&contextmenu_open_in_reader;</string>
   <string name="contextmenu_remove_history">&contextmenu_remove_history;</string>
   <string name="contextmenu_remove_bookmark">&contextmenu_remove_bookmark;</string>