Create mojom and StructTraits for ui/display/types/display_mode.cc

ui/display/types/display_mode.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_DISPLAY_TYPES_DISPLAY_MODE_H_
 #define UI_DISPLAY_TYPES_DISPLAY_MODE_H_
 
 #include <memory>
 #include <ostream>
 #include <string>
 
 #include "base/macros.h"
 #include "ui/display/types/display_types_export.h"
 #include "ui/gfx/geometry/size.h"
 
+#if !defined(OS_IOS)

[kylechar, 2017/01/25 16:59:45]

Get rid of all the !defined(OS_IOS) ifdefs, here and below.

[thanhph1, 2017/01/25 20:28:40]

Done.

+#include "mojo/public/cpp/bindings/struct_traits.h"  // nogncheck

[kylechar, 2017/01/25 16:59:45]

Remove the // nogncheck.

[thanhph1, 2017/01/25 20:28:40]

Done.

+#endif
+
 namespace display {
 
+#if !defined(OS_IOS)
+namespace mojom {
+class DisplayModeDataView;
+}
+#endif
+
 // This class represents the basic information for a native mode. Platforms will
 // extend this class to add platform specific information about the mode.
 class DISPLAY_TYPES_EXPORT DisplayMode {
  public:
+  DisplayMode();

[kylechar, 2017/01/25 16:59:45]

Can you make this private? I'm not sure what instantiates it. If it's not
DisplayModeDataView then don't worry, leave this here.

[thanhph1, 2017/01/25 20:28:40]

This display_struct_traits_test.mojom.cc uses it so I can't put it in private.

gen/ui/display/mojo/display_struct_traits_test.mojom.cc:61:24: error: calling a
private constructor of class 'display::DisplayMode'
  display::DisplayMode p_out{};

   DisplayMode(const gfx::Size& size, bool interlaced, float refresh_rate);
+  DisplayMode(DisplayMode&&);
+  DisplayMode& operator=(DisplayMode&&);
+
   virtual ~DisplayMode();
   virtual std::unique_ptr<DisplayMode> Clone() const;
 
   const gfx::Size& size() const { return size_; }
   bool is_interlaced() const { return is_interlaced_; }
   float refresh_rate() const { return refresh_rate_; }
 
   virtual std::string ToString() const;
 
  private:
   gfx::Size size_;
   bool is_interlaced_;
   float refresh_rate_;
 
+#if !defined(OS_IOS)
+  friend struct mojo::StructTraits<mojom::DisplayModeDataView, DisplayMode>;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(DisplayMode);
 };
 
 // Used to by gtest to print readable errors.
 DISPLAY_TYPES_EXPORT void PrintTo(const DisplayMode& mode, std::ostream* os);
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_TYPES_DISPLAY_MODE_H_