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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <memory>
@@ skipping 242 matching lines @@
              !is_panel;
     case windows::WINDOW_STATE_NORMAL:
     case windows::WINDOW_STATE_DOCKED:
     case windows::WINDOW_STATE_NONE:
       return true;
   }
   NOTREACHED();
   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)
       return true;
   }
   return false;
 }
+#endif
 
 }  // namespace
 
 void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode,
                             api::tabs::ZoomSettings* zoom_settings) {
   DCHECK(zoom_settings);
   switch (zoom_mode) {
     case ZoomController::ZOOM_MODE_DEFAULT:
       zoom_settings->mode = api::tabs::ZOOM_SETTINGS_MODE_AUTOMATIC;
       zoom_settings->scope = api::tabs::ZOOM_SETTINGS_SCOPE_PER_ORIGIN;
@@ skipping 233 matching lines @@
   }
 
   Browser::Type window_type = Browser::TYPE_TABBED;
 
 #if defined(USE_ASH)
   bool create_ash_panel = false;
 #endif  // defined(USE_ASH)
 
   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) {
     // Figure out window type before figuring out bounds so that default
     // bounds can be set according to the window type.
     switch (create_data->type) {
       case windows::CREATE_TYPE_POPUP:
         window_type = Browser::TYPE_POPUP;
         extension_id = extension()->id();
         break;
@@ skipping 52 matching lines @@
       window_bounds.set_y(*create_data->top);
 
     if (create_data->width)
       window_bounds.set_width(*create_data->width);
 
     if (create_data->height)
       window_bounds.set_height(*create_data->height);
 
     if (create_data->focused) {
       focused = *create_data->focused;
+#if defined(USE_ASH)
       saw_focus_key = true;
+#endif
     }
   }
 
 #if defined(USE_ASH)
   if (create_ash_panel) {
     if (urls.empty())
       urls.push_back(GURL(chrome::kChromeUINewTabURL));
 
     AppWindow::CreateParams create_params;
     create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;
@@ skipping 1580 matching lines @@
       params->tab_id
           ? ErrorUtils::FormatErrorMessage(keys::kCannotDiscardTab,
                                            base::IntToString(*params->tab_id))
           : keys::kCannotFindTabToDiscard));
 }
 
 TabsDiscardFunction::TabsDiscardFunction() {}
 TabsDiscardFunction::~TabsDiscardFunction() {}
 
 }  // namespace extensions