Refactor SyncedWindowDelegateAndroid into TabModel

chrome/browser/metrics/metrics_service.cc

 // Copyright (c) 2012 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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It
@@ skipping 193 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>  // Needed for STATUS_* codes
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/ui/android/tab_model/tab_model_list_android.h"
+#endif
+
 using base::Time;
 using content::BrowserThread;
 using content::ChildProcessData;
 using content::LoadNotificationDetails;
 using content::PluginService;
 
 namespace {
 
 // Check to see that we're being called on only one thread.
 bool IsSingleThreaded() {
@@ skipping 1622 matching lines @@
   child_process_stats_buffer_.clear();
 }
 
 bool MetricsService::CanLogNotification(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   // We simply don't log anything to UMA if there is a single incognito
   // session visible. The problem is that we always notify using the orginal
   // profile in order to simplify notification processing.
+#if defined(OS_ANDROID)
+  return !TabModelListAndroid::IsOffTheRecordSessionActive();

[sky, 2012/07/16 23:07:30]

I would rather see a function in the browser namespace that does this. The
android implementation would call off to TabModelListAndroid, and the
non-android implementation would use BrowserList::IsOffTheRecordSessionActive.
Maybe put these in browser_otr_state.h, browser_otr_state.cc and
browser_otr_state_android.cc

[David Trainor- moved to gerrit, 2012/07/18 23:59:04]

Done.

[jar (doing other things), 2012/07/19 00:11:35]

I see the comment... and your "done," but don't see the change.

On 2012/07/18 23:59:04, dtrainor wrote:

+#else
   return !BrowserList::IsOffTheRecordSessionActive();
+#endif
 }
 
 void MetricsService::RecordBooleanPrefValue(const char* path, bool value) {
   DCHECK(IsSingleThreaded());
 
   PrefService* pref = g_browser_process->local_state();
   DCHECK(pref);
 
   pref->SetBoolean(path, value);
   RecordCurrentState(pref);
@@ skipping 26 matching lines @@
   if (local_state) {
     const PrefService::Preference* uma_pref =
         local_state->FindPreference(prefs::kMetricsReportingEnabled);
     if (uma_pref) {
       bool success = uma_pref->GetValue()->GetAsBoolean(&result);
       DCHECK(success);
     }
   }
   return result;
 }