Fix bad merge conflict resolution from m55 merge of IME window fix.

ui/chromeos/ime/candidate_window_view.cc

 // Copyright 2014 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 "ui/chromeos/ime/candidate_window_view.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 141 matching lines @@
     : selected_candidate_index_in_page_(-1),
       should_show_at_composition_head_(false),
       should_show_upper_side_(false),
       was_candidate_window_open_(false) {
   set_can_activate(false);
   set_parent_window(parent);
   set_margins(gfx::Insets());
 
   SetBorder(views::Border::CreateSolidBorder(
       1,
-      GetNativeTheme()->theme->GetSystemColor(
+      GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_MenuBorderColor)));
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   auxiliary_text_ = new InformationTextArea(gfx::ALIGN_RIGHT, 0);
   preedit_ = new InformationTextArea(gfx::ALIGN_LEFT, kMinPreeditAreaWidth);
   candidate_area_ = new views::View;
   auxiliary_text_->SetVisible(false);
   preedit_->SetVisible(false);
   candidate_area_->SetVisible(false);
   preedit_->SetBorderFromPosition(InformationTextArea::BOTTOM);
@@ skipping 237 matching lines @@
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     if (sender == candidate_views_[i]) {
       FOR_EACH_OBSERVER(Observer, observers_, OnCandidateCommitted(i));
       return;
     }
   }
 }
 
 }  // namespace ime
 }  // namespace ui