Build error in chrome/browser/extensions/api/tabs/tabs_api.cc.

chrome/browser/extensions/api/tabs/tabs_api.cc

Index: chrome/browser/extensions/api/tabs/tabs_api.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 093bd9f8f98ec2c06a282e9eeeaca7169f3a3a0f..30615226a842e737cbfe8163a9c58a2b08f87c75 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -260,6 +260,7 @@ bool IsValidStateForWindowsCreateFunction(
   return true;
 }
 
+#if defined(USE_ASH)
 bool IsHangoutsExtensionId(const std::string& extension_id) {

[Devlin, 2016/08/25 20:51:06]

Since this is only used in one location, maybe we should just inline it to avoid
having yet-more #if defineds here.

   for (const char* id : extension_misc::kHangoutsExtensionIds) {
     if (extension_id == id)
@@ -267,6 +268,7 @@ bool IsHangoutsExtensionId(const std::string& extension_id) {
   }
   return false;
 }
+#endif
 
 }  // namespace
 
@@ -520,7 +522,9 @@ bool WindowsCreateFunction::RunSync() {
 
   gfx::Rect window_bounds;
   bool focused = true;
+#if defined(USE_ASH)
   bool saw_focus_key = false;

[Devlin, 2016/08/25 20:51:06]

can we put this on line 521 so that it's in the same block as create_ash_panel?

+#endif
   std::string extension_id;
 
   if (create_data) {
@@ -593,7 +597,9 @@ bool WindowsCreateFunction::RunSync() {
 
     if (create_data->focused) {
       focused = *create_data->focused;
+#if defined(USE_ASH)
       saw_focus_key = true;
+#endif
     }
   }