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..f053c79d799ad56e36ffde3636935c55b949b586 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -260,14 +260,6 @@ bool IsValidStateForWindowsCreateFunction(
   return true;
 }
 
-bool IsHangoutsExtensionId(const std::string& extension_id) {
-  for (const char* id : extension_misc::kHangoutsExtensionIds) {
-    if (extension_id == id)
-      return true;
-  }
-  return false;
-}
-
 }  // namespace
 
 void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode,
@@ -516,11 +508,11 @@ bool WindowsCreateFunction::RunSync() {
 
 #if defined(USE_ASH)
   bool create_ash_panel = false;
+  bool saw_focus_key = false;
 #endif  // defined(USE_ASH)
 
   gfx::Rect window_bounds;
   bool focused = true;
-  bool saw_focus_key = false;
   std::string extension_id;
 
   if (create_data) {
@@ -536,12 +528,15 @@ bool WindowsCreateFunction::RunSync() {
       case windows::CREATE_TYPE_DETACHED_PANEL: {
         extension_id = extension()->id();
 #if defined(USE_ASH)
-      // Only ChromeOS' version of chrome.windows.create would create a panel
-      // window. It is whitelisted to Hangouts extension for limited time until
-      // it transitioned to other types of windows.
-        if (IsHangoutsExtensionId(extension_id)) {
-          create_ash_panel = true;
-          break;
+        // Only ChromeOS' version of chrome.windows.create would
+        // create a panel window.

[Devlin, 2016/08/26 15:09:53]

nit: comment wrapping was correct before.

[Anton Obzhirov, 2016/08/26 16:02:57]

Ups, I thought I was fixing it :)

+        // It is whitelisted to Hangouts extension for limited time until
+        // it transitioned to other types of windows.
+        for (const char* id : extension_misc::kHangoutsExtensionIds) {
+          if (extension_id == id) {
+            create_ash_panel = true;
+            break;
+          }
         }
 #endif  // defined(USE_ASH)
         // Everything else gets POPUP instead of PANEL.
@@ -593,7 +588,9 @@ bool WindowsCreateFunction::RunSync() {
 
     if (create_data->focused) {
       focused = *create_data->focused;
+#if defined(USE_ASH)
       saw_focus_key = true;
+#endif
     }
   }