Aura on Android: Compile extensions gn target.

BUG=548797

Review URL: https://codereview.chromium.org/1419103010

Cr-Commit-Position: refs/heads/master@{#360642}

chrome/app/generated_resources.grd

@@ -649,8 +649,8 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
         Right to Left
       </message>
 
-      <!-- content area context menus. Android does not use it -->
-      <if expr="not is_android">
+      <!-- content area context menus. -->
+      <if expr="not is_android or use_aura">
         <message name="IDS_CONTENT_CONTEXT_INSPECTELEMENT" desc="The name of the Inspect Element command in the content area context menu">
           I&amp;nspect
         </message>
@@ -10041,8 +10041,8 @@ I don't think this site should be blocked!
         Platform
       </message>
 
-      <!-- chrome://settings. Android uses native UI for settings -->
-      <if expr="not is_android">
+      <!-- chrome://settings. Non-Aura Android uses native UI for settings -->
+      <if expr="not is_android or use_aura">
         <if expr="chromeos">
           <message name="IDS_OPTIONS_INTERNET_TAB_LABEL" desc="The title of the Internet tab">
             Internet
@@ -14106,7 +14106,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
       </if>
 
       <!-- Media Galleries. -->
-      <if expr="not is_android">
+      <if expr="not is_android or use_aura">
         <message name="IDS_MEDIA_GALLERIES_DIALOG_HEADER" desc="Header for media gallery permissions dialog.">
           Media-File Permissions for "<ph name="EXTENSION">$1<ex>Photo Editor</ex></ph>"
         </message>

chrome/browser/extensions/component_loader.cc

@@ -27,6 +27,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/crx_file/id_util.h"
 #include "components/signin/core/browser/signin_manager.h"
@@ -66,10 +67,6 @@
 #include "storage/browser/fileapi/file_system_context.h"
 #endif
 
-#if defined(ENABLE_APP_LIST)
-#include "chrome/grit/chromium_strings.h"
-#endif
-
 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
 #include "chrome/browser/ui/app_list/google_now_extension.h"
 #endif

chrome/browser/ui/browser_navigator_params.cc

@@ -8,7 +8,7 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #endif
@@ -19,7 +19,7 @@ using content::WebContents;
 
 namespace chrome {
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 namespace {
 
 HostDesktopType GetHostDesktop(Browser* browser) {
@@ -52,7 +52,9 @@ NavigateParams::NavigateParams(WebContents* a_target_contents)
       should_replace_current_entry(false),
       created_with_opener(false) {
 }
-#else
+#endif  // defined(OS_ANDROID)
+
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 NavigateParams::NavigateParams(Browser* a_browser,
                                const GURL& a_url,
                                ui::PageTransition a_transition)
@@ -100,7 +102,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
       should_replace_current_entry(false),
       created_with_opener(false) {
 }
-#endif  // !defined(OS_ANDROID)
+#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
 
 NavigateParams::NavigateParams(Profile* a_profile,
                                const GURL& a_url,
@@ -120,7 +122,7 @@ NavigateParams::NavigateParams(Profile* a_profile,
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
       browser(NULL),
 #endif
       initiating_profile(a_profile),

chrome/browser/ui/browser_navigator_params.h

@@ -55,7 +55,8 @@ namespace chrome {
 struct NavigateParams {
 #if defined(OS_ANDROID)
   explicit NavigateParams(content::WebContents* a_target_contents);
-#else
+#endif
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   NavigateParams(Browser* browser,
                  const GURL& a_url,
                  ui::PageTransition a_transition);
@@ -205,7 +206,7 @@ struct NavigateParams {
   // Default is IGNORE.
   RefBehavior ref_behavior;
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   // [in]  Specifies a Browser object where the navigation could occur or the
   //       tab could be added. Navigate() is not obliged to use this Browser if
   //       it is not compatible with the operation being performed. This can be

chrome/common/pref_names.cc

@@ -1178,7 +1178,7 @@ const char kEasyUnlockPairing[] = "easy_unlock.pairing";
 // in order to use Easy Unlock.
 const char kEasyUnlockProximityRequired[] = "easy_unlock.proximity_required";
 
-#if defined(ENABLE_EXTENSIONS) && !defined(OS_ANDROID) && !defined(OS_IOS)
+#if defined(ENABLE_EXTENSIONS)
 // These device IDs are used by the copresence component, to uniquely identify
 // this device to the server. For privacy, authenticated and unauthenticated
 // calls are made using different device IDs.

chrome/common/pref_names.h

@@ -397,7 +397,7 @@ extern const char kEasyUnlockEnabled[];
 extern const char kEasyUnlockPairing[];
 extern const char kEasyUnlockProximityRequired[];
 
-#if defined(ENABLE_EXTENSIONS) && !defined(OS_ANDROID) && !defined(OS_IOS)
+#if defined(ENABLE_EXTENSIONS)
 extern const char kCopresenceAuthenticatedDeviceId[];
 extern const char kCopresenceAnonymousDeviceId[];
 extern const char kToolbarIconSurfacingBubbleAcknowledged[];