Merge branch 'master' of github.com:flutter/samples into add_to_vsi

experimental/web_dashboard/lib/main.dart

@@ -7,5 +7,5 @@ import 'package:flutter/material.dart';
 import 'src/app.dart';
 
 void main() {
-  runApp(DashboardApp());
+  runApp(DashboardApp.mock());
 }

experimental/web_dashboard/lib/main_firebase.dart

@@ -7,5 +7,5 @@ import 'package:flutter/material.dart';
 import 'src/app.dart';
 
 void main() {
-  runApp(DashboardApp.mock());
+  runApp(DashboardApp.firebase());
 }

experimental/web_dashboard/lib/src/app.dart

@@ -39,7 +39,7 @@ class DashboardApp extends StatefulWidget {
   final ApiBuilder apiBuilder;
 
   /// Runs the app using Firebase
-  DashboardApp()
+  DashboardApp.firebase()
       : auth = FirebaseAuthService(),
         apiBuilder = _apiBuilder;
 

experimental/web_dashboard/tool/grind.dart

@@ -24,16 +24,16 @@ void runWeb() {
 }
 
 @Task()
-void runMock() {
+void runFirebase() {
   run('flutter',
-      arguments: 'run -d web --web-port=5000 lib/main_mock.dart '.split(' '));
+      arguments: 'run -d web --web-port=5000 lib/main_firebase.dart '.split(' '));
 }
 
 @Task()
-void runMockSkia() {
+void runFirebaseSkia() {
   run('flutter',
       arguments:
-          'run -d web --web-port=5000 --release --dart-define=FLUTTER_WEB_USE_SKIA=true lib/main_mock.dart'
+          'run -d web --web-port=5000 --release --dart-define=FLUTTER_WEB_USE_SKIA=true lib/main_firebase.dart'
               .split(' '));
 }