Revert of Split ui/base/ime into a new component

ui/base/ime/candidate_window.h

 // 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.
 
 #ifndef UI_BASE_IME_CANDIDATE_WINDOW_H_
 #define UI_BASE_IME_CANDIDATE_WINDOW_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/ime/infolist_entry.h"
-#include "ui/base/ime/ui_base_ime_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // CandidateWindow represents the structure of candidates generated from IME.
-class UI_BASE_IME_EXPORT CandidateWindow {
+class UI_BASE_EXPORT CandidateWindow {
  public:
   enum Orientation {
     HORIZONTAL = 0,
     VERTICAL = 1,
   };
 
-  struct UI_BASE_IME_EXPORT CandidateWindowProperty {
+  struct UI_BASE_EXPORT CandidateWindowProperty {
     CandidateWindowProperty();
     virtual ~CandidateWindowProperty();
     int page_size;
     int cursor_position;
     bool is_cursor_visible;
     bool is_vertical;
     bool show_window_at_composition;
 
     // Auxiliary text is typically displayed in the footer of the candidate
     // window.
     std::string auxiliary_text;
     bool is_auxiliary_text_visible;
   };
 
   // Represents a candidate entry.
-  struct UI_BASE_IME_EXPORT Entry {
+  struct UI_BASE_EXPORT Entry {
     Entry();
     virtual ~Entry();
     base::string16 value;
     base::string16 label;
     base::string16 annotation;
     base::string16 description_title;
     base::string16 description_body;
   };
 
   CandidateWindow();
@@ skipping 70 matching lines @@
  private:
   scoped_ptr<CandidateWindowProperty> property_;
   std::vector<Entry> candidates_;
 
   DISALLOW_COPY_AND_ASSIGN(CandidateWindow);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_CANDIDATE_WINDOW_H_