Replace OutputSnapshot |is_internal| with check against 'type == OUTPUT_TYPE_INTERNAL'

chromeos/display/real_output_configurator_delegate.cc

 // Copyright (c) 2013 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 "chromeos/display/real_output_configurator_delegate.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/XInput.h>
@@ skipping 259 matching lines @@
 RealOutputConfiguratorDelegate::InitOutputSnapshot(
     RROutput id,
     XRROutputInfo* info,
     RRCrtc* last_used_crtc,
     int index) {
   OutputConfigurator::OutputSnapshot output;
   output.output = id;
   output.width_mm = info->mm_width;
   output.height_mm = info->mm_height;
   output.has_display_id = base::GetDisplayId(id, index, &output.display_id);
-  output.is_internal = IsInternalOutput(info);
   output.index = index;
+  bool is_internal = IsInternalOutput(info);
 
   // Use the index as a valid display ID even if the internal
   // display doesn't have valid EDID because the index
   // will never change.
-  if (!output.has_display_id && output.is_internal)
+  if (!output.has_display_id && is_internal)
     output.has_display_id = true;
 
   if (info->crtc) {
     XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(display_, screen_, info->crtc);
     output.current_mode = crtc_info->mode;
     output.x = crtc_info->x;
     output.y = crtc_info->y;
     XRRFreeCrtcInfo(crtc_info);
   }
 
@@ skipping 13 matching lines @@
   for (int i = 0; i < info->nmode; ++i) {
     const RRMode mode = info->modes[i];
     OutputConfigurator::ModeInfo mode_info;
     if (InitModeInfo(mode, &mode_info))
       output.mode_infos.insert(std::make_pair(mode, mode_info));
     else
       LOG(WARNING) << "Unable to find XRRModeInfo for mode " << mode;
   }
 
   std::string name(info->name);
-  if (output.is_internal) {
+  if (is_internal) {
     output.type = OUTPUT_TYPE_INTERNAL;
   } else if (name.find(kOutputName_VGA) == 0) {
     output.type = OUTPUT_TYPE_VGA;
   } else if (name.find(kOutputName_HDMI) == 0) {
     output.type = OUTPUT_TYPE_HDMI;
   } else if (name.find(kOutputName_DVI) == 0) {
     output.type = OUTPUT_TYPE_DVI;
   } else if (name.find(kOutputName_DisplayPort) == 0) {
     output.type = OUTPUT_TYPE_DISPLAYPORT;
   } else {
@@ skipping 259 matching lines @@
   }
 
   // Sometimes we can't find a matching screen for the touchscreen, e.g.
   // due to the touchscreen's reporting range having no correlation with the
   // screen's resolution. In this case, we arbitrarily assign unmatched
   // touchscreens to unmatched screens.
   for (std::set<int>::iterator it = no_match_touchscreen.begin();
        it != no_match_touchscreen.end();
        it++) {
     for (size_t i = 0; i < outputs->size(); i++) {
-      if ((*outputs)[i].is_internal == false &&
+      if ((*outputs)[i].type != OUTPUT_TYPE_INTERNAL &&
           (*outputs)[i].native_mode != None &&
           (*outputs)[i].touch_device_id == None ) {
         (*outputs)[i].touch_device_id = *it;
         VLOG(2) << "Arbitrarily matching touchscreen "
                 << (*outputs)[i].touch_device_id << " to output #" << i;
         break;
       }
     }
   }
 
   XIFreeDeviceInfo(info);
 }
 
 }  // namespace chromeos