ChangeScreen2: Temporarily drop "CC" list

Users are confused about Reviewers vs. CC, as the backend does
not correctly support this concept.

Drop CC from the UI for now but keep the users categorized by
"those with scores first" and "everyone else".

Move the [+] widget up onto the Reviewers line.

Change-Id: I0057ff0f7078af9c28db5ad484351b836ce82a22

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java

@@ -137,7 +137,7 @@ public class ChangeScreen2 extends Screen {
   @UiField ToggleButton star;
   @UiField Anchor permalink;
 
-  @UiField Element reviewersText;
+  @UiField Element ccText;
   @UiField Reviewers reviewers;
   @UiField Element ownerText;
   @UiField Element statusText;
@@ -234,7 +234,7 @@ public class ChangeScreen2 extends Screen {
     Resources.I.style().ensureInjected();
     star.setVisible(Gerrit.isSignedIn());
     labels.init(style, statusText);
-    reviewers.init(style, reviewersText);
+    reviewers.init(style, ccText);
 
     keysNavigation = new KeyCommandSet(Gerrit.C.sectionNavigation());
     keysNavigation.add(new KeyCommand(0, 'u', Util.C.upToChangeList()) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml

@@ -383,14 +383,14 @@ limitations under the License.
             </tr>
             <tr>
               <th><ui:msg>Reviewers</ui:msg></th>
-              <td ui:field='reviewersText'/>
-            </tr>
-            <tr>
-              <th><ui:msg>CC</ui:msg></th>
               <td>
                 <c:Reviewers ui:field='reviewers'/>
               </td>
             </tr>
+            <tr>
+              <th/>
+              <td ui:field='ccText'/>
+            </tr>
             <tr>
               <th><ui:msg>Project</ui:msg></th>
               <td><x:InlineHyperlink ui:field='projectLink'

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java

@@ -61,7 +61,7 @@ class Reviewers extends Composite {
   interface Binder extends UiBinder<HTMLPanel, Reviewers> {}
   private static final Binder uiBinder = GWT.create(Binder.class);
 
-  @UiField Element ccText;
+  @UiField Element reviewersText;
   @UiField Button openForm;
   @UiField Element form;
   @UiField Element error;
@@ -69,7 +69,7 @@ class Reviewers extends Composite {
   SuggestBox suggestBox;
 
   private ChangeScreen2.Style style;
-  private Element reviewersText;
+  private Element ccText;
 
   private RestReviewerSuggestOracle reviewerSuggestOracle;
   private HintTextBox nameTxtBox;
@@ -112,9 +112,9 @@ class Reviewers extends Composite {
     });
   }
 
-  void init(ChangeScreen2.Style style, Element reviewersText) {
+  void init(ChangeScreen2.Style style, Element ccText) {
     this.style = style;
-    this.reviewersText = reviewersText;
+    this.ccText = ccText;
   }
 
   void set(ChangeInfo info) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.ui.xml

@@ -44,7 +44,7 @@ limitations under the License.
   </ui:style>
   <g:HTMLPanel>
     <div>
-      <span ui:field='ccText'/>
+      <span ui:field='reviewersText'/>
       <g:Button ui:field='openForm'
          title='Add reviewers to this change'
          styleName='{style.openAdd}'