diff options
| -rw-r--r-- | chrome/browser/browser.scons | 23 | ||||
| -rw-r--r-- | chrome/browser/metrics_log.cc | 8 |
2 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 3848b37..40599fb4 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -42,11 +42,15 @@ input_files = [] if env['PLATFORM'] in ('posix', 'win32'): # TODO: Port to Mac. input_files.extend([ + 'autocomplete/keyword_provider.cc', 'automation/url_request_failed_dns_job.cc', 'automation/url_request_mock_http_job.cc', 'automation/url_request_mock_net_error_job.cc', 'automation/url_request_slow_download_job.cc', + 'bookmarks/bookmark_codec.cc', + 'bookmarks/bookmark_html_writer.cc', 'browser_process.cc', + 'browser_trial.cc', 'cancelable_request.cc', 'chrome_thread.cc', 'cross_site_request_manager.cc', @@ -55,6 +59,7 @@ if env['PLATFORM'] in ('posix', 'win32'): 'extensions/extensions_service.cc', 'google_url_tracker.cc', 'google_util.cc', + 'greasemonkey_master.cc', 'history/archived_database.cc', 'history/download_database.cc', 'history/expire_history_backend.cc', @@ -74,7 +79,14 @@ if env['PLATFORM'] in ('posix', 'win32'): 'history/visit_database.cc', 'history/visit_tracker.cc', 'history/visitsegment_database.cc', + 'history_model.cc', + 'importer/firefox2_importer.cc', + 'importer/firefox3_importer.cc', + 'importer/firefox_profile_lock.cc', + 'importer/firefox_profile_lock_posix.cc', + 'importer/mork_reader.cc', 'meta_table_helper.cc', + 'metrics_log.cc', 'metrics_response.cc', 'net/dns_host_info.cc', 'net/referrer.cc', @@ -114,7 +126,6 @@ if env['PLATFORM'] == 'win32': 'autocomplete/edit_drop_target.cc', 'autocomplete/history_contents_provider.cc', 'autocomplete/history_url_provider.cc', - 'autocomplete/keyword_provider.cc', 'autocomplete/search_provider.cc', 'automation/automation_provider.cc', 'automation/automation_provider_list.cc', @@ -122,12 +133,10 @@ if env['PLATFORM'] == 'win32': 'automation/ui_controls.cc', 'back_forward_menu_model.cc', 'base_history_model.cc', - 'bookmarks/bookmark_codec.cc', 'bookmarks/bookmark_context_menu.cc', 'bookmarks/bookmark_drag_data.cc', 'bookmarks/bookmark_drop_info.cc', 'bookmarks/bookmark_folder_tree_model.cc', - 'bookmarks/bookmark_html_writer.cc', 'bookmarks/bookmark_model.cc', 'bookmarks/bookmark_storage.cc', 'bookmarks/bookmark_table_model.cc', @@ -142,7 +151,6 @@ if env['PLATFORM'] == 'win32': 'browser_prefs.cc', 'browser_process_impl.cc', 'browser_shutdown.cc', - 'browser_trial.cc', 'browser_url_handler.cc', 'browsing_data_remover.cc', 'browsing_instance.cc', @@ -175,25 +183,19 @@ if env['PLATFORM'] == 'win32': 'fav_icon_helper.cc', 'first_run.cc', 'gears_integration.cc', - 'greasemonkey_master.cc', 'hang_monitor/hung_plugin_action.cc', 'hang_monitor/hung_window_detector.cc', 'history/history.cc', 'history/history_publisher.cc', - 'history_model.cc', 'history_tab_ui.cc', 'history_view.cc', 'icon_loader.cc', 'icon_manager.cc', 'ie7_password.cc', 'ime_input.cc', - 'importer/firefox2_importer.cc', 'importer/firefox_importer_utils.cc', - 'importer/firefox_profile_lock.cc', - 'importer/firefox3_importer.cc', 'importer/ie_importer.cc', 'importer/importer.cc', - 'importer/mork_reader.cc', 'importer/toolbar_importer.cc', 'infobar_delegate.cc', 'interstitial_page.cc', @@ -203,7 +205,6 @@ if env['PLATFORM'] == 'win32': 'jsmessage_box_handler.cc', 'login_prompt.cc', 'memory_details.cc', - 'metrics_log.cc', 'metrics_service.cc', 'modal_html_dialog_delegate.cc', 'native_ui_contents.cc', diff --git a/chrome/browser/metrics_log.cc b/chrome/browser/metrics_log.cc index 6d8397a..16a24b7 100644 --- a/chrome/browser/metrics_log.cc +++ b/chrome/browser/metrics_log.cc @@ -41,12 +41,12 @@ void MetricsLog::RegisterPrefs(PrefService* local_state) { MetricsLog::MetricsLog(const std::string& client_id, int session_id) : start_time_(Time::Now()), - num_events_(0), + client_id_(client_id), + session_id_(IntToString(session_id)), locked_(false), buffer_(NULL), writer_(NULL), - client_id_(client_id), - session_id_(IntToString(session_id)) { + num_events_(0) { buffer_ = xmlBufferCreate(); DCHECK(buffer_); @@ -110,7 +110,7 @@ std::string MetricsLog::CreateHash(const std::string& value) { unsigned char reverse[8]; // UMA only uses first 8 chars of hash. DCHECK(arraysize(digest.a) >= arraysize(reverse)); - for (int i = 0; i < arraysize(reverse); ++i) + for (size_t i = 0; i < arraysize(reverse); ++i) reverse[i] = digest.a[arraysize(reverse) - i - 1]; LOG(INFO) << "Metrics: Hash numeric [" << value << "]=[" << *reinterpret_cast<const uint64*>(&reverse[0]) << "]"; |