From 7500fb48839f028a04c2c2295bc9c53fbe340d7c Mon Sep 17 00:00:00 2001
From: nyquist <nyquist@chromium.org>
Date: Mon, 11 Jan 2016 18:47:10 -0800
Subject: [PATCH] Move SelectionBoundType to inside the LayerSelectionBound
 message.

The SelectionBoundType is only used inside the LayerSelectionBound
proto message, so it should be part of that instead of a top-level
proto, which causes issues with other top-level enums in the same
namespace.

BUG=561210
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1578523002

Cr-Commit-Position: refs/heads/master@{#368781}
---
 cc/input/layer_selection_bound.cc    | 28 ++++++++++++++--------------
 cc/proto/layer_selection_bound.proto | 16 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/cc/input/layer_selection_bound.cc b/cc/input/layer_selection_bound.cc
index a5146dcbbaa948..f2852241d369fb 100644
--- a/cc/input/layer_selection_bound.cc
+++ b/cc/input/layer_selection_bound.cc
@@ -10,35 +10,35 @@
 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;
diff --git a/cc/proto/layer_selection_bound.proto b/cc/proto/layer_selection_bound.proto
index 84dd559fdda119..2503e8aa6d0004 100644
--- a/cc/proto/layer_selection_bound.proto
+++ b/cc/proto/layer_selection_bound.proto
@@ -10,15 +10,15 @@ option optimize_for = LITE_RUNTIME;
 
 package cc.proto;
 
-enum SelectionBoundType {
-  UNKNOWN = 0;
-  LEFT = 1;
-  RIGHT = 2;
-  CENTER = 3;
-  EMPTY = 4;
-}
-
 message LayerSelectionBound {
+  enum SelectionBoundType {
+    UNKNOWN = 0;
+    LEFT = 1;
+    RIGHT = 2;
+    CENTER = 3;
+    EMPTY = 4;
+  }
+
   optional SelectionBoundType type = 1;
   optional Point edge_top = 2;
   optional Point edge_bottom = 3;