| Index: chrome/browser/chromeos/input_method/candidate_window.cc
|
| diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
|
| index 9ec44e35d93ae040b97df5d41243035d6634ffba..515dfe13c9141b390faa50bfeff312da4a4c2809 100644
|
| --- a/chrome/browser/chromeos/input_method/candidate_window.cc
|
| +++ b/chrome/browser/chromeos/input_method/candidate_window.cc
|
| @@ -80,6 +80,10 @@ const int kInfolistHideDelayMilliSeconds = 500;
|
| // VerticalCandidateLabel is used for rendering candidate text in
|
| // the vertical candidate window.
|
| class VerticalCandidateLabel : public views::Label {
|
| + public:
|
| + VerticalCandidateLabel() {}
|
| +
|
| + private:
|
| virtual ~VerticalCandidateLabel() {}
|
|
|
| // Returns the preferred size, but guarantees that the width has at
|
| @@ -98,6 +102,8 @@ class VerticalCandidateLabel : public views::Label {
|
| }
|
| return size;
|
| }
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(VerticalCandidateLabel);
|
| };
|
|
|
| // Wraps the given view with some padding, and returns it.
|
| @@ -371,6 +377,8 @@ class HidableArea : public views::View {
|
| private:
|
| scoped_ptr<views::View> contents_;
|
| scoped_ptr<views::View> place_holder_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(HidableArea);
|
| };
|
|
|
| // InformationTextArea is a HidableArea having a single Label in it.
|
| @@ -413,6 +421,8 @@ class InformationTextArea : public HidableArea {
|
| private:
|
| views::Label* label_;
|
| int minWidth_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(InformationTextArea);
|
| };
|
|
|
| // CandidateRow renderes a row of a candidate.
|
| @@ -485,6 +495,8 @@ class CandidateView : public views::View {
|
| // The infolist icon.
|
| views::Label* infolist_label_;
|
| bool infolist_icon_enabled_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(CandidateView);
|
| };
|
|
|
| class InfolistView;
|
| @@ -534,6 +546,8 @@ class InfolistWindowView : public views::View {
|
| bool visible_;
|
|
|
| base::OneShotTimer<InfolistWindowView> show_hide_timer_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(InfolistWindowView);
|
| };
|
|
|
| // InfolistRow renderes a row of a infolist.
|
| @@ -573,8 +587,9 @@ class InfolistView : public views::View {
|
| views::Label* title_label_;
|
| // The description label.
|
| views::Label* description_label_;
|
| -};
|
|
|
| + DISALLOW_COPY_AND_ASSIGN(InfolistView);
|
| +};
|
|
|
| // The implementation of CandidateWindowController.
|
| // CandidateWindowController controls the CandidateWindow.
|
| @@ -624,6 +639,8 @@ class CandidateWindowController::Impl : public CandidateWindowView::Observer,
|
| // This is the outer frame of the infolist window view. The frame will
|
| // own |infolist_window_|.
|
| scoped_ptr<views::Widget> infolist_frame_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(Impl);
|
| };
|
|
|
| CandidateView::CandidateView(
|
|
|