Merge pull request #7 from cefsharp/cleanup/restructuremvvm

Trivial changes and code cleanups

CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj

@@ -56,8 +56,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon>chromium-256.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -79,10 +78,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Views\Main\MainView.xaml.cs">
+    <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Main\MainViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -95,7 +94,7 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Views\Main\MainView.xaml">
+    <Page Include="Views\MainView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

CefSharp.MinimalExample.Wpf/MainWindow.xaml

@@ -1,7 +1,7 @@
 <Window x:Class="CefSharp.MinimalExample.Wpf.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:main="clr-namespace:CefSharp.MinimalExample.Wpf.Views.Main"
+        xmlns:main="clr-namespace:CefSharp.MinimalExample.Wpf.Views"
         Title="{Binding WebBrowser.Title}"
         WindowState="Maximized">
     <main:MainView/>

CefSharp.MinimalExample.Wpf/MainWindow.xaml.cs

@@ -1,7 +1,4 @@
-using CefSharp.MinimalExample.Wpf.Mvvm;
-using CefSharp.Wpf;
-using System.ComponentModel;
-using System.Windows;
+using System.Windows;
 
 namespace CefSharp.MinimalExample.Wpf
 {

CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs

@@ -3,7 +3,7 @@ using CefSharp.Wpf;
 using System.ComponentModel;
 using System.Windows;
 
-namespace CefSharp.MinimalExample.Wpf.Views.Main
+namespace CefSharp.MinimalExample.Wpf.ViewModels
 {
     public class MainViewModel
     {

CefSharp.MinimalExample.Wpf/Views/MainView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="CefSharp.MinimalExample.Wpf.Views.Main.MainView"
+<UserControl x:Class="CefSharp.MinimalExample.Wpf.Views.MainView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

CefSharp.MinimalExample.Wpf/Views/MainView.xaml.cs

@@ -1,6 +1,7 @@
 using System.Windows.Controls;
+using CefSharp.MinimalExample.Wpf.ViewModels;
 
-namespace CefSharp.MinimalExample.Wpf.Views.Main
+namespace CefSharp.MinimalExample.Wpf.Views
 {
     public partial class MainView : UserControl
     {