Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 468 matching lines @@
 #endif
   params.app_name = DevToolsWindow::kDevToolsApp;
   return CreateWithParams(params);
 }
 
 void Browser::InitBrowserWindow() {
   DCHECK(!window_);
 
   window_ = CreateBrowserWindow();
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   {
     // TODO: This might hit the disk
     //   http://code.google.com/p/chromium/issues/detail?id=61638
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 
     // Set the app user model id for this application to that of the application
     // name.  See http://crbug.com/7028.
     ui::win::SetAppIdForWindow(
         is_app() ?
         ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
@@ skipping 4676 matching lines @@
 }
 
 void Browser::ShowSyncSetup() {
   ProfileSyncService* service =
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }