summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/app_list/search/omnibox_provider.cc3
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm6
-rw-r--r--chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm6
-rw-r--r--chrome/browser/ui/omnibox/omnibox_edit_model.cc24
-rw-r--r--chrome/browser/ui/omnibox/omnibox_edit_model.h3
-rw-r--r--chrome/browser/ui/views/frame/browser_root_view.cc5
-rw-r--r--chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc4
-rw-r--r--chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc3
-rw-r--r--chrome/browser/ui/webui/options/home_page_overlay_handler.cc3
-rw-r--r--chrome/browser/ui/webui/options/startup_pages_handler.cc3
10 files changed, 34 insertions, 26 deletions
diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc
index 35e3fa5..2212e4f 100644
--- a/chrome/browser/ui/app_list/search/omnibox_provider.cc
+++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/autocomplete/search_provider.h"
#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
#include "chrome/browser/ui/browser_navigator.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -147,7 +148,7 @@ void OmniboxProvider::Start(const base::string16& query) {
base::string16::npos,
base::string16(),
GURL(),
- AutocompleteInput::INVALID_SPEC,
+ metrics::OmniboxEventProto::INVALID_SPEC,
false,
false,
true,
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 83e37d2..051a103 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -19,7 +19,6 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/autocomplete/autocomplete_classifier.h"
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/extensions/tab_helper.h"
@@ -52,6 +51,7 @@
#include "chrome/browser/ui/tabs/tab_utils.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/url_fixer/url_fixer.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/navigation_controller.h"
@@ -2091,8 +2091,8 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
// If the input is plain text, classify the input and make the URL.
AutocompleteMatch match;
AutocompleteClassifierFactory::GetForProfile(browser_->profile())->Classify(
- base::SysNSStringToUTF16(text), false, false, AutocompleteInput::BLANK,
- &match, NULL);
+ base::SysNSStringToUTF16(text), false, false,
+ metrics::OmniboxEventProto::BLANK, &match, NULL);
GURL url(match.destination_url);
[self openURL:&url inView:view at:point];
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 4a6d6de..f89d75e 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -16,7 +16,6 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/autocomplete/autocomplete_classifier.h"
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/command_updater.h"
@@ -50,6 +49,7 @@
#include "chrome/browser/ui/toolbar/wrench_menu_model.h"
#include "chrome/browser/upgrade_detector.h"
#include "chrome/common/pref_names.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/url_fixer/url_fixer.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_observer.h"
@@ -836,8 +836,8 @@ class NotificationBridge
// If the input is plain text, classify the input and make the URL.
AutocompleteMatch match;
AutocompleteClassifierFactory::GetForProfile(browser_->profile())->Classify(
- base::SysNSStringToUTF16(text), false, false, AutocompleteInput::BLANK,
- &match, NULL);
+ base::SysNSStringToUTF16(text), false, false,
+ metrics::OmniboxEventProto::BLANK, &match, NULL);
GURL url(match.destination_url);
OpenURLParams params(
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index f2958b7..a8ce25d 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -56,6 +56,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/google/core/browser/google_url_tracker.h"
#include "components/url_fixer/url_fixer.h"
#include "content/public/browser/navigation_controller.h"
@@ -67,6 +68,7 @@
#include "ui/gfx/image/image.h"
#include "url/url_util.h"
+using metrics::OmniboxEventProto;
using predictors::AutocompleteActionPredictor;
@@ -1426,31 +1428,31 @@ bool OmniboxEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
}
}
-AutocompleteInput::PageClassification OmniboxEditModel::ClassifyPage() const {
+OmniboxEventProto::PageClassification OmniboxEditModel::ClassifyPage() const {
if (!delegate_->CurrentPageExists())
- return AutocompleteInput::OTHER;
+ return OmniboxEventProto::OTHER;
if (delegate_->IsInstantNTP()) {
// Note that we treat OMNIBOX as the source if focus_source_ is INVALID,
// i.e., if input isn't actually in progress.
return (focus_source_ == FAKEBOX) ?
- AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS :
- AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
+ OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS :
+ OmniboxEventProto::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
}
const GURL& gurl = delegate_->GetURL();
if (!gurl.is_valid())
- return AutocompleteInput::INVALID_SPEC;
+ return OmniboxEventProto::INVALID_SPEC;
const std::string& url = gurl.spec();
if (url == chrome::kChromeUINewTabURL)
- return AutocompleteInput::NTP;
+ return OmniboxEventProto::NTP;
if (url == url::kAboutBlankURL)
- return AutocompleteInput::BLANK;
+ return OmniboxEventProto::BLANK;
if (url == profile()->GetPrefs()->GetString(prefs::kHomePage))
- return AutocompleteInput::HOME_PAGE;
+ return OmniboxEventProto::HOME_PAGE;
if (controller_->GetToolbarModel()->WouldPerformSearchTermReplacement(true))
- return AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
+ return OmniboxEventProto::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
if (delegate_->IsSearchResultsPage())
- return AutocompleteInput::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
- return AutocompleteInput::OTHER;
+ return OmniboxEventProto::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
+ return OmniboxEventProto::OTHER;
}
void OmniboxEditModel::ClassifyStringForPasteAndGo(
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index 6550c40..2aaa63b 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -16,6 +16,7 @@
#include "chrome/browser/ui/omnibox/omnibox_controller.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/omnibox_focus_state.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "content/public/common/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
#include "ui/gfx/native_widget_types.h"
@@ -420,7 +421,7 @@ class OmniboxEditModel {
// page or a normal web page. Used for logging omnibox events for
// UMA opted-in users. Examines the user's profile to determine if the
// current page is the user's home page.
- AutocompleteInput::PageClassification ClassifyPage() const;
+ metrics::OmniboxEventProto::PageClassification ClassifyPage() const;
// Sets |match| and |alternate_nav_url| based on classifying |text|.
// |alternate_nav_url| may be NULL.
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index 46c355b..6ac54d9 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -6,7 +6,6 @@
#include "chrome/browser/autocomplete/autocomplete_classifier.h"
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/profiles/profile.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/browser/ui/views/touch_uma/touch_uma.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/hit_test.h"
@@ -199,7 +199,8 @@ bool BrowserRootView::GetPasteAndGoURL(const ui::OSExchangeData& data,
AutocompleteMatch match;
AutocompleteClassifierFactory::GetForProfile(
browser_view_->browser()->profile())->Classify(
- text, false, false, AutocompleteInput::INVALID_SPEC, &match, NULL);
+ text, false, false, metrics::OmniboxEventProto::INVALID_SPEC, &match,
+ NULL);
if (!match.destination_url.is_valid())
return false;
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index def498b..f34f3ff 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -10,7 +10,6 @@
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/autocomplete/autocomplete_classifier.h"
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -30,6 +29,7 @@
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/plugin_service.h"
@@ -370,7 +370,7 @@ void BrowserTabStripController::CreateNewTabWithLocation(
// a search query if necessary.
AutocompleteMatch match;
AutocompleteClassifierFactory::GetForProfile(profile())->Classify(
- location, false, false, AutocompleteInput::BLANK, &match, NULL);
+ location, false, false, metrics::OmniboxEventProto::BLANK, &match, NULL);
if (match.destination_url.is_valid())
model_->delegate()->AddTabAt(match.destination_url, -1, true);
}
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
index dcb072c..9e3bb8b 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/history/url_database.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/search_engines/template_url.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "content/public/browser/web_ui.h"
#include "mojo/common/common_type_converters.h"
@@ -172,7 +173,7 @@ void OmniboxUIHandler::StartOmniboxQuery(const mojo::String& input_string,
cursor_position,
base::string16(), // user's desired tld (top-level domain)
GURL(),
- static_cast<AutocompleteInput::PageClassification>(
+ static_cast<metrics::OmniboxEventProto::PageClassification>(
page_classification),
prevent_inline_autocomplete,
prefer_keyword,
diff --git a/chrome/browser/ui/webui/options/home_page_overlay_handler.cc b/chrome/browser/ui/webui/options/home_page_overlay_handler.cc
index 4d48add..b4d3361 100644
--- a/chrome/browser/ui/webui/options/home_page_overlay_handler.cc
+++ b/chrome/browser/ui/webui/options/home_page_overlay_handler.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/autocomplete/autocomplete_input.h"
#include "chrome/browser/autocomplete/autocomplete_result.h"
#include "chrome/browser/profiles/profile.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "content/public/browser/web_ui.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -51,7 +52,7 @@ void HomePageOverlayHandler::RequestAutocompleteSuggestions(
autocomplete_controller_->Start(AutocompleteInput(
input, base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, true, false, false, true));
+ metrics::OmniboxEventProto::INVALID_SPEC, true, false, false, true));
}
void HomePageOverlayHandler::OnResultChanged(bool default_match_changed) {
diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc
index 96f4d6a..b6be2b4 100644
--- a/chrome/browser/ui/webui/options/startup_pages_handler.cc
+++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/url_fixer/url_fixer.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/web_ui.h"
@@ -236,7 +237,7 @@ void StartupPagesHandler::RequestAutocompleteSuggestions(
autocomplete_controller_->Start(AutocompleteInput(
input, base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, true, false, false, true));
+ metrics::OmniboxEventProto::INVALID_SPEC, true, false, false, true));
}
void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
generated by cgit v1.1 at 2025-05-21 10:04:27 +0000