From b2f9088eb9e60bf141891fd62e796bdf20054b06 Mon Sep 17 00:00:00 2001
From: Kasper Lund <kasper@verdich.dk>
Date: Thu, 3 Apr 2014 16:16:17 +0200
Subject: [PATCH] fix(cookies): Make sure Cookies is injectable.

Also clean-up a few warnings and remove an unnecessary workaround
in the todo example.
---
 example/web/todo.dart                           | 3 ---
 lib/core_dom/cookies.dart                       | 1 +
 lib/tools/transformer/expression_generator.dart | 2 +-
 test/io/test_files/templates/main.dart          | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/example/web/todo.dart b/example/web/todo.dart
index 5f80c13ba..d39cc89e0 100644
--- a/example/web/todo.dart
+++ b/example/web/todo.dart
@@ -72,9 +72,6 @@ class TodoController {
     serverController.init(this);
   }
 
-  // workaround for https://github.com/angular/angular.dart/issues/37
-  dynamic operator [](String key) => key == 'newItem' ? newItem : null;
-
   void add() {
     if (newItem.isEmpty) return;
 
diff --git a/lib/core_dom/cookies.dart b/lib/core_dom/cookies.dart
index 394e20d3e..9577ec90c 100644
--- a/lib/core_dom/cookies.dart
+++ b/lib/core_dom/cookies.dart
@@ -96,6 +96,7 @@ class BrowserCookies {
 /**
  *   Cookies service
  */
+@NgInjectableService()
 class Cookies {
   BrowserCookies _browserCookies;
   Cookies(this._browserCookies);
diff --git a/lib/tools/transformer/expression_generator.dart b/lib/tools/transformer/expression_generator.dart
index 38ae7d8e4..80d01b9e0 100644
--- a/lib/tools/transformer/expression_generator.dart
+++ b/lib/tools/transformer/expression_generator.dart
@@ -177,7 +177,7 @@ final Map<String, Symbol> symbols = ${generateSymbolMap(symbols)};
     return '{\n${lines.join(",\n")}\n}';
   }
 
-  generateSymbolMap(Set<Strings> symbols) {
+  generateSymbolMap(Set<String> symbols) {
     var lines = symbols.map((key) => '  r"${key}": #$key');
     return '{\n${lines.join(",\n")}\n}';
   }
diff --git a/test/io/test_files/templates/main.dart b/test/io/test_files/templates/main.dart
index 322d28e5c..4099f2043 100644
--- a/test/io/test_files/templates/main.dart
+++ b/test/io/test_files/templates/main.dart
@@ -1,6 +1,6 @@
 library test_files.main;
 
-import 'package:angular/core/module_internal.dart';
+import 'package:angular/core/annotation.dart';
 import 'package:angular/tools/template_cache_annotation.dart';
 
 part 'partial.dart';