Move SelectionBoundType to inside the LayerSelectionBound message.

cc/input/layer_selection_bound.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 "base/logging.h"
 #include "cc/input/layer_selection_bound.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/layer_selection_bound.pb.h"
 
 namespace cc {
 namespace {
 
-proto::SelectionBoundType SelectionBoundTypeToProtobuf(
+proto::LayerSelectionBound::SelectionBoundType SelectionBoundTypeToProtobuf(
     const SelectionBoundType& type) {
   switch (type) {
     case SELECTION_BOUND_LEFT:
-      return proto::SelectionBoundType::LEFT;
+      return proto::LayerSelectionBound_SelectionBoundType_LEFT;
     case SELECTION_BOUND_RIGHT:
-      return proto::SelectionBoundType::RIGHT;
+      return proto::LayerSelectionBound_SelectionBoundType_RIGHT;
     case SELECTION_BOUND_CENTER:
-      return proto::SelectionBoundType::CENTER;
+      return proto::LayerSelectionBound_SelectionBoundType_CENTER;
     case SELECTION_BOUND_EMPTY:
-      return proto::SelectionBoundType::EMPTY;
+      return proto::LayerSelectionBound_SelectionBoundType_EMPTY;
   }
-  NOTREACHED() << "proto::SelectionBoundType::UNKNOWN";
-  return proto::SelectionBoundType::UNKNOWN;
+  NOTREACHED() << "proto::LayerSelectionBound_SelectionBoundType_UNKNOWN";
+  return proto::LayerSelectionBound_SelectionBoundType_UNKNOWN;
 }
 
 SelectionBoundType SelectionBoundTypeFromProtobuf(
-    const proto::SelectionBoundType& type) {
+    const proto::LayerSelectionBound::SelectionBoundType& type) {
   switch (type) {
-    case proto::SelectionBoundType::LEFT:
+    case proto::LayerSelectionBound_SelectionBoundType_LEFT:
       return SELECTION_BOUND_LEFT;
-    case proto::SelectionBoundType::RIGHT:
+    case proto::LayerSelectionBound_SelectionBoundType_RIGHT:
       return SELECTION_BOUND_RIGHT;
-    case proto::SelectionBoundType::CENTER:
+    case proto::LayerSelectionBound_SelectionBoundType_CENTER:
       return SELECTION_BOUND_CENTER;
-    case proto::SelectionBoundType::EMPTY:
+    case proto::LayerSelectionBound_SelectionBoundType_EMPTY:
       return SELECTION_BOUND_EMPTY;
-    case proto::SelectionBoundType::UNKNOWN:
-      NOTREACHED() << "proto::SelectionBoundType::UNKNOWN";
+    case proto::LayerSelectionBound_SelectionBoundType_UNKNOWN:
+      NOTREACHED() << "proto::LayerSelectionBound_SelectionBoundType_UNKNOWN";
       return SELECTION_BOUND_EMPTY;
   }
   return SELECTION_BOUND_EMPTY;
 }
 
 }  // namespace
 
 LayerSelectionBound::LayerSelectionBound()
     : type(SELECTION_BOUND_EMPTY), layer_id(0) {
 }
@@ skipping 35 matching lines @@
 
 void LayerSelectionFromProtobuf(LayerSelection* selection,
                                 const proto::LayerSelection& proto) {
   selection->start.FromProtobuf(proto.start());
   selection->end.FromProtobuf(proto.end());
   selection->is_editable = proto.is_editable();
   selection->is_empty_text_form_control = proto.is_empty_text_form_control();
 }
 
 }  // namespace cc