Add the ability for keys to be drawn as an image.

services/keyboard_native/key_layout.h

 // Copyright 2015 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 SERVICES_KEYBOARD_NATIVE_KEY_LAYOUT_H_
 #define SERVICES_KEYBOARD_NATIVE_KEY_LAYOUT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/tools/embed/data.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkImageDecoder.h"

[viettrungluu, 2015/06/02 22:29:35]

I don't think you need these includes in the .h, only in the .cc, no?

[APW, 2015/06/02 23:16:55]

Done.

+#include "third_party/skia/include/core/SkStream.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace keyboard {
 
 // Represents a drawable keyboard.
 class KeyLayout {
  public:
   // All keys represented by this KeyBoard layout will implement the Key
   // interface.
@@ skipping 36 matching lines @@
   // Indicate to the keyboard that a touch up has occurred at the given Point.
   void OnTouchUp(const gfx::Point& touch_up);
 
  private:
   // An implementation of Key that draws itself as ASCII text.
   class TextKey : public Key {
    public:
     TextKey(const char* text,
             base::Callback<void(const TextKey&)> touch_up_callback);
     ~TextKey() override;
+
+    // Key implementation.
     void Draw(SkCanvas* canvas, SkPaint paint, const gfx::RectF& rect) override;
     const char* ToText() const override;
     void OnTouchUp() override;
 
    private:
     const char* text_;
     base::Callback<void(const TextKey&)> touch_up_callback_;
 
     DISALLOW_COPY_AND_ASSIGN(TextKey);
   };
 
+  // An implementation of Key that draws itself as an image.
+  class ImageKey : public Key {
+   public:
+    ImageKey(const char* text,
+             base::Callback<void(const TextKey&)> touch_up_callback,
+             const mojo::embed::Data& data);

[viettrungluu, 2015/06/02 22:29:35]

Probably you can just forward declare mojo::embed::Data, rather than including
the header?

Also worth mentioning: You might consider just declaring this in an anonymous
namespace in the .cc file. (This would also avoid any include for SkBitmap.)

(Also note that you can just forward declare TextKey in this file, and put the
full declaration in the .cc file.)

[APW, 2015/06/02 23:16:55]

Done.

+    ~ImageKey() override;
+
+    // Key implementation.
+    void Draw(SkCanvas* canvas, SkPaint paint, const gfx::RectF& rect) override;
+    const char* ToText() const override;
+    void OnTouchUp() override;
+
+   private:
+    TextKey text_key_;
+    bool bitmap_valid_;
+    SkBitmap bitmap_;
+
+    DISALLOW_COPY_AND_ASSIGN(ImageKey);
+  };
+
   // initializes the *_layout_ vectors.
   void InitLayouts();
 
   // initializes the *_key_map_ vectors.
   void InitKeyMaps();
 
   // A TextKey callback that does nothing.
   void OnKeyDoNothing(const TextKey& key);
 
   // A TextKey callback that calls on_text_callback_ with the text of the
@@ skipping 23 matching lines @@
   std::vector<std::vector<Key*>> upper_case_key_map_;
   std::vector<std::vector<Key*>> symbols_key_map_;
   base::WeakPtrFactory<KeyLayout> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyLayout);
 };
 
 }  // namespace keyboard
 
 #endif  // SERVICES_KEYBOARD_NATIVE_KEY_LAYOUT_H_