Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: chrome/browser/metrics/metrics_log.cc

Issue 21395002: [InstantExtended] Fixing how PageLoadSRP is emitted. Previously it was emitted only for Instant sea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: this time actually fixing merge error correctly Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/metrics/metrics_log.h" 5 #include "chrome/browser/metrics/metrics_log.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 return OmniboxEventProto::OTHER; 156 return OmniboxEventProto::OTHER;
157 case AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT: 157 case AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT:
158 return OmniboxEventProto:: 158 return OmniboxEventProto::
159 SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT; 159 SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
160 case AutocompleteInput::INSTANT_NEW_TAB_PAGE_WITH_OMNIBOX_AS_STARTING_FOCUS: 160 case AutocompleteInput::INSTANT_NEW_TAB_PAGE_WITH_OMNIBOX_AS_STARTING_FOCUS:
161 return OmniboxEventProto:: 161 return OmniboxEventProto::
162 INSTANT_NEW_TAB_PAGE_WITH_OMNIBOX_AS_STARTING_FOCUS; 162 INSTANT_NEW_TAB_PAGE_WITH_OMNIBOX_AS_STARTING_FOCUS;
163 case AutocompleteInput::INSTANT_NEW_TAB_PAGE_WITH_FAKEBOX_AS_STARTING_FOCUS: 163 case AutocompleteInput::INSTANT_NEW_TAB_PAGE_WITH_FAKEBOX_AS_STARTING_FOCUS:
164 return OmniboxEventProto:: 164 return OmniboxEventProto::
165 INSTANT_NEW_TAB_PAGE_WITH_FAKEBOX_AS_STARTING_FOCUS; 165 INSTANT_NEW_TAB_PAGE_WITH_FAKEBOX_AS_STARTING_FOCUS;
166 case AutocompleteInput::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT:
167 return OmniboxEventProto::
168 SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
166 } 169 }
167 return OmniboxEventProto::INVALID_SPEC; 170 return OmniboxEventProto::INVALID_SPEC;
168 } 171 }
169 172
170 ProfilerEventProto::TrackedObject::ProcessType AsProtobufProcessType( 173 ProfilerEventProto::TrackedObject::ProcessType AsProtobufProcessType(
171 int process_type) { 174 int process_type) {
172 switch (process_type) { 175 switch (process_type) {
173 case content::PROCESS_TYPE_BROWSER: 176 case content::PROCESS_TYPE_BROWSER:
174 return ProfilerEventProto::TrackedObject::BROWSER; 177 return ProfilerEventProto::TrackedObject::BROWSER;
175 case content::PROCESS_TYPE_RENDERER: 178 case content::PROCESS_TYPE_RENDERER:
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 955
953 paired_device->set_vendor_prefix(vendor_prefix); 956 paired_device->set_vendor_prefix(vendor_prefix);
954 } 957 }
955 958
956 paired_device->set_vendor_id(device->GetVendorID()); 959 paired_device->set_vendor_id(device->GetVendorID());
957 paired_device->set_product_id(device->GetProductID()); 960 paired_device->set_product_id(device->GetProductID());
958 paired_device->set_device_id(device->GetDeviceID()); 961 paired_device->set_device_id(device->GetDeviceID());
959 } 962 }
960 #endif // defined(OS_CHROMEOS) 963 #endif // defined(OS_CHROMEOS)
961 } 964 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_input.h ('k') | chrome/browser/metrics/metrics_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698