Set user-visible machine names and devices types for synced sessions.

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 100 matching lines @@
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_throttler_manager.h"
 #include "net/websockets/websocket_job.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(OS_LINUX)
+#include "base/linux_util.h"
+#endif
 #if defined(USE_LINUX_BREAKPAD)
-#include "base/linux_util.h"
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <dbus/dbus-glib.h>
 
 #include "chrome/browser/browser_main_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
@@ skipping 137 matching lines @@
 
 void AddFirstRunNewTabs(BrowserInit* browser_init,
                         const std::vector<GURL>& new_tabs) {
   for (std::vector<GURL>::const_iterator it = new_tabs.begin();
        it != new_tabs.end(); ++it) {
     if (it->is_valid())
       browser_init->AddFirstRunTab(*it);
   }
 }
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_LINUX)
 class GetLinuxDistroTask : public Task {
  public:
   explicit GetLinuxDistroTask() {}
 
   virtual void Run() {
     base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
   }
 
   DISALLOW_COPY_AND_ASSIGN(GetLinuxDistroTask);
 };
-#endif  // USE_LINUX_BREAKPAD
+#endif  // OS_LINUX
 
 void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kEnableFileCookies)) {
     // Enable cookie storage for file:// URLs.  Must do this before the first
     // Profile (and therefore the first CookieMonster) is created.
     net::CookieMonster::EnableFileScheme();
   }
 
   if (parsed_command_line.HasSwitch(switches::kEnableMacCookies))
     net::URLRequest::EnableMacCookies();
@@ skipping 1112 matching lines @@
   // window station. During this time all the UI will be broken. This has to
   // run before threads and windows are created.
   InitializeBrokerServices(parameters, parsed_command_line);
 
   // Initialize histogram statistics gathering system.
   base::StatisticsRecorder statistics;
 
   PrefService* local_state = InitializeLocalState(parsed_command_line,
                                                   is_first_run);
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_LINUX)
   // Needs to be called after we have chrome::DIR_USER_DATA and
   // g_browser_process.
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,

[sky, 2011/08/31 03:35:16]

Why do we need the linux distro if we're not going to use it?

[Yaron, 2011/08/31 23:23:22]

Ya, I was too cavalier about it. Done in the sync code now.

       new GetLinuxDistroTask());
+#endif
 
+#if defined(USE_LINUX_BREAKPAD)
   if (IsCrashReportingEnabled(local_state))
     InitCrashReporter();
 #endif
 
   // If we're running tests (ui_task is non-null), then the ResourceBundle
   // has already been initialized.
   if (parameters.ui_task) {
     g_browser_process->SetApplicationLocale("en-US");
   } else {
     // Mac starts it earlier in |PreMainMessageLoopStart()| (because it is
@@ skipping 743 matching lines @@
   std::string pre_read;
   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
 }
-