dom distiller: extract markup properties from protobuf

components/dom_distiller/core/distiller_page.h

 // Copyright 2013 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 COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_PAGE_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_PAGE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "third_party/dom_distiller_js/dom_distiller.pb.h"
 #include "ui/gfx/size.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 struct DistilledPageInfo {
+  struct MarkupArticle {
+    std::string published_time;
+    std::string modified_time;
+    std::string expiration_time;
+    std::string section;
+    std::vector<std::string> authors;
+
+    MarkupArticle();
+    ~MarkupArticle();
+  };
+
+  struct MarkupImage {
+    std::string url;
+    std::string secure_url;
+    std::string type;
+    std::string caption;
+    int width;
+    int height;
+
+    MarkupImage();
+    ~MarkupImage();
+  };
+
+  struct MarkupInfo {
+    std::string title;
+    std::string type;
+    std::string url;
+    std::string description;
+    std::string publisher;
+    std::string copyright;
+    std::string author;
+    MarkupArticle article;
+    std::vector<MarkupImage> images;
+
+    MarkupInfo();
+    ~MarkupInfo();
+  };
+
   std::string title;
   std::string html;
   std::string next_page_url;
   std::string prev_page_url;
   std::vector<std::string> image_urls;
+  MarkupInfo markup_info;
+
   DistilledPageInfo();
   ~DistilledPageInfo();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DistilledPageInfo);
 };
 
 class SourcePageHandle {
  public:
   virtual ~SourcePageHandle() {}
@@ skipping 48 matching lines @@
   // used.
   virtual scoped_ptr<DistillerPage> CreateDistillerPage(
       const gfx::Size& render_view_size) const = 0;
   virtual scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
       scoped_ptr<SourcePageHandle> handle) const = 0;
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_PAGE_H_