Get chrome to link with USE_AURA

chrome/browser/browser_main.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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 431 matching lines @@
         user_data_dir);
   } else {
     profile = g_browser_process->profile_manager()->GetDefaultProfile(
         user_data_dir);
   }
 
   if (profile)
     return profile;
 
 #if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(beng):
+  NOTIMPLEMENTED();
+#else
   // Ideally, we should be able to run w/o access to disk.  For now, we
   // prompt the user to pick a different user-data-dir and restart chrome
   // with the new dir.
   // http://code.google.com/p/chromium/issues/detail?id=11510
   FilePath new_user_data_dir = UserDataDirDialog::RunUserDataDirDialog(
       user_data_dir);
   if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) {
     // Only delete the resources if we're not running tests. If we're running
     // tests the resources need to be reused as many places in the UI cache
     // SkBitmaps from the ResourceBundle.
     ResourceBundle::CleanupSharedInstance();
   }
 
   if (!new_user_data_dir.empty()) {
     // Because of the way CommandLine parses, it's sufficient to append a new
     // --user-data-dir switch.  The last flag of the same name wins.
     // TODO(tc): It would be nice to remove the flag we don't want, but that
     // sounds risky if we parse differently than CommandLineToArgvW.
     CommandLine new_command_line = parameters.command_line_;
     new_command_line.AppendSwitchPath(switches::kUserDataDir,
                                       new_user_data_dir);
     base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL);
   }
+#endif
 #else
   // TODO(port): fix this.  See comments near the definition of
   // user_data_dir.  It is better to CHECK-fail here than it is to
   // silently exit because of missing code in the above test.
   CHECK(profile) << "Cannot get default profile.";
 #endif
 
   return NULL;
 }
 
@@ skipping 716 matching lines @@
 #endif  // defined(OS_MACOSX)
   }
 
 #if defined(TOOLKIT_GTK)
   g_set_application_name(l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str());
 #endif
 
   std::string try_chrome =
       parsed_command_line().GetSwitchValueASCII(switches::kTryChromeAgain);
   if (!try_chrome.empty()) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     // Setup.exe has determined that we need to run a retention experiment
     // and has lauched chrome to show the experiment UI.
     if (process_singleton.FoundOtherProcessWindow()) {
       // It seems that we don't need to run the experiment since chrome
       // in the same profile is already running.
       VLOG(1) << "Retention experiment not required";
       return TryChromeDialogView::NOT_NOW;
     }
     int try_chrome_int;
     base::StringToInt(try_chrome, &try_chrome_int);
@@ skipping 714 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }