diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 19:04:12 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 19:04:12 +0000 |
commit | afe3a16739185a648a21a34e07f3cdb5f1a23c2f (patch) | |
tree | 4c82ce550948ed3d67a7a46a1aa066c9080412fb /chrome/browser/gtk | |
parent | d699e3a52d6431ea5d2a691f77866ac8ec7ba350 (diff) | |
download | chromium_src-afe3a16739185a648a21a34e07f3cdb5f1a23c2f.zip chromium_src-afe3a16739185a648a21a34e07f3cdb5f1a23c2f.tar.gz chromium_src-afe3a16739185a648a21a34e07f3cdb5f1a23c2f.tar.bz2 |
Use plain strings instead of wstrings for UMA actions
git grep 'RecordAction(L' | xargs sed -i -e s/RecordAction(L/RecordAction(/
This cuts more than 10k off my binary. Which is nothing compared
to the size of the binary, but that's a whole lot of zero bytes!
This is less code this way anyway.
Review URL: http://codereview.chromium.org/399026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/bookmark_bubble_gtk.cc | 10 | ||||
-rw-r--r-- | chrome/browser/gtk/bookmark_context_menu_gtk.cc | 24 | ||||
-rw-r--r-- | chrome/browser/gtk/options/advanced_contents_gtk.cc | 56 | ||||
-rw-r--r-- | chrome/browser/gtk/options/advanced_page_gtk.cc | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.cc | 18 | ||||
-rw-r--r-- | chrome/browser/gtk/options/general_page_gtk.cc | 16 | ||||
-rw-r--r-- | chrome/browser/gtk/options/languages_page_gtk.cc | 2 |
8 files changed, 65 insertions, 65 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 7c22ccd..579b69e0 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -881,7 +881,7 @@ void BookmarkBarGtk::OnClicked(GtkWidget* sender, event_utils::DispositionFromEventFlags(event->state), PageTransition::AUTO_BOOKMARK); - UserMetrics::RecordAction(L"ClickedBookmarkBarURLButton", bar->profile_); + UserMetrics::RecordAction("ClickedBookmarkBarURLButton", bar->profile_); } // static diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc index 0e82f2d..5b32c7f 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc @@ -281,7 +281,7 @@ void BookmarkBubbleGtk::HandleNameActivate() { void BookmarkBubbleGtk::HandleFolderChanged() { size_t cur_folder = gtk_combo_box_get_active(GTK_COMBO_BOX(folder_combo_)); if (cur_folder == folder_nodes_.size()) { - UserMetrics::RecordAction(L"BookmarkBubble_EditFromCombobox", profile_); + UserMetrics::RecordAction("BookmarkBubble_EditFromCombobox", profile_); // GTK doesn't handle having the combo box destroyed from the changed // signal. Since showing the editor also closes the bubble, delay this // so that GTK can unwind. Specifically gtk_menu_shell_button_release @@ -303,7 +303,7 @@ void BookmarkBubbleGtk::HandleFolderPopupShown() { } void BookmarkBubbleGtk::HandleEditButton() { - UserMetrics::RecordAction(L"BookmarkBubble_Edit", profile_); + UserMetrics::RecordAction("BookmarkBubble_Edit", profile_); ShowEditor(); } @@ -312,7 +312,7 @@ void BookmarkBubbleGtk::HandleCloseButton() { } void BookmarkBubbleGtk::HandleRemoveButton() { - UserMetrics::RecordAction(L"BookmarkBubble_Unstar", profile_); + UserMetrics::RecordAction("BookmarkBubble_Unstar", profile_); apply_edits_ = false; remove_bookmark_ = true; @@ -333,7 +333,7 @@ void BookmarkBubbleGtk::ApplyEdits() { if (new_title != node->GetTitle()) { model->SetTitle(node, new_title); - UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble", + UserMetrics::RecordAction("BookmarkBubble_ChangeTitleInBubble", profile_); } @@ -343,7 +343,7 @@ void BookmarkBubbleGtk::ApplyEdits() { if (cur_folder < folder_nodes_.size()) { const BookmarkNode* new_parent = folder_nodes_[cur_folder]; if (new_parent != node->GetParent()) { - UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent", profile_); + UserMetrics::RecordAction("BookmarkBubble_ChangeParent", profile_); model->Move(node, new_parent, new_parent->GetChildCount()); } } diff --git a/chrome/browser/gtk/bookmark_context_menu_gtk.cc b/chrome/browser/gtk/bookmark_context_menu_gtk.cc index b0b2819..8c94609 100644 --- a/chrome/browser/gtk/bookmark_context_menu_gtk.cc +++ b/chrome/browser/gtk/bookmark_context_menu_gtk.cc @@ -306,16 +306,16 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { WindowOpenDisposition initial_disposition; if (id == IDS_BOOMARK_BAR_OPEN_ALL) { initial_disposition = NEW_FOREGROUND_TAB; - UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_OpenAll", + UserMetrics::RecordAction("BookmarkBar_ContextMenu_OpenAll", profile_); } else if (id == IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW) { initial_disposition = NEW_WINDOW; - UserMetrics::RecordAction( - L"BookmarkBar_ContextMenu_OpenAllInNewWindow", profile_); + UserMetrics::RecordAction("BookmarkBar_ContextMenu_OpenAllInNewWindow", + profile_); } else { initial_disposition = OFF_THE_RECORD; - UserMetrics::RecordAction( - L"BookmarkBar_ContextMenu_OpenAllIncognito", profile_); + UserMetrics::RecordAction("BookmarkBar_ContextMenu_OpenAllIncognito", + profile_); } bookmark_utils::OpenAll(wnd_, profile_, navigator, selection_, @@ -325,7 +325,7 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { case IDS_BOOKMARK_BAR_RENAME_FOLDER: case IDS_BOOKMARK_BAR_EDIT: - UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Edit", profile_); + UserMetrics::RecordAction("BookmarkBar_ContextMenu_Edit", profile_); if (selection_.size() != 1) { NOTREACHED(); @@ -348,7 +348,7 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { break; case IDS_BOOKMARK_BAR_REMOVE: { - UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Remove", profile_); + UserMetrics::RecordAction("BookmarkBar_ContextMenu_Remove", profile_); BookmarkModel* model = RemoveModelObserver(); for (size_t i = 0; i < selection_.size(); ++i) { @@ -360,7 +360,7 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { } case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK: { - UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Add", profile_); + UserMetrics::RecordAction("BookmarkBar_ContextMenu_Add", profile_); BookmarkEditor::Configuration editor_config; BookmarkEditor::Handler* handler = NULL; @@ -378,7 +378,7 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { } case IDS_BOOMARK_BAR_NEW_FOLDER: { - UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_NewFolder", + UserMetrics::RecordAction("BookmarkBar_ContextMenu_NewFolder", profile_); EditFolderController::Show(profile_, wnd_, GetParentForNewNodes(), true, (configuration_ != BOOKMARK_BAR)); @@ -390,7 +390,7 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { break; case IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER: - UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_ShowInFolder", + UserMetrics::RecordAction("BookmarkBar_ContextMenu_ShowInFolder", profile_); if (selection_.size() != 1) { @@ -402,12 +402,12 @@ void BookmarkContextMenuGtk::ExecuteCommand(int id) { break; case IDS_BOOKMARK_MANAGER: - UserMetrics::RecordAction(L"ShowBookmarkManager", profile_); + UserMetrics::RecordAction("ShowBookmarkManager", profile_); BookmarkManager::Show(profile_); break; case IDS_BOOKMARK_MANAGER_SORT: - UserMetrics::RecordAction(L"BookmarkManager_Sort", profile_); + UserMetrics::RecordAction("BookmarkManager_Sort", profile_); model_->SortChildren(parent_); break; diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 75711cf..48fa6da 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -272,7 +272,7 @@ void DownloadSection::OnDownloadLocationChanged(GtkFileChooser* widget, // metric if something actually changed. if (path.ToWStringHack() != section->default_download_location_.GetValue()) { section->default_download_location_.SetValue(path.ToWStringHack()); - section->UserMetricsRecordAction(L"Options_SetDownloadDirectory", + section->UserMetricsRecordAction("Options_SetDownloadDirectory", section->profile()->GetPrefs()); } } @@ -284,10 +284,10 @@ void DownloadSection::OnDownloadAskForSaveLocationChanged( return; bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); if (enabled) { - section->UserMetricsRecordAction(L"Options_AskForSaveLocation_Enable", + section->UserMetricsRecordAction("Options_AskForSaveLocation_Enable", section->profile()->GetPrefs()); } else { - section->UserMetricsRecordAction(L"Options_AskForSaveLocation_Disable", + section->UserMetricsRecordAction("Options_AskForSaveLocation_Disable", section->profile()->GetPrefs()); } section->ask_for_save_location_.SetValue(enabled); @@ -297,7 +297,7 @@ void DownloadSection::OnDownloadAskForSaveLocationChanged( void DownloadSection::OnResetFileHandlersClicked(GtkButton *button, DownloadSection* section) { section->profile()->GetDownloadManager()->ResetAutoOpenFiles(); - section->UserMetricsRecordAction(L"Options_ResetAutoOpenFiles", + section->UserMetricsRecordAction("Options_ResetAutoOpenFiles", section->profile()->GetPrefs()); } @@ -362,7 +362,7 @@ NetworkSection::NetworkSection(Profile* profile) // static void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button, NetworkSection* section) { - section->UserMetricsRecordAction(L"Options_ChangeProxies", NULL); + section->UserMetricsRecordAction("Options_ChangeProxies", NULL); scoped_ptr<base::EnvironmentVariableGetter> env_getter( base::EnvironmentVariableGetter::Create()); @@ -646,8 +646,8 @@ void PrivacySection::OnEnableLinkDoctorChange(GtkWidget* widget, bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); privacy_section->UserMetricsRecordAction( enabled ? - L"Options_LinkDoctorCheckbox_Enable" : - L"Options_LinkDoctorCheckbox_Disable", + "Options_LinkDoctorCheckbox_Enable" : + "Options_LinkDoctorCheckbox_Disable", privacy_section->profile()->GetPrefs()); privacy_section->alternate_error_pages_.SetValue(enabled); } @@ -660,8 +660,8 @@ void PrivacySection::OnEnableSuggestChange(GtkWidget* widget, bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); privacy_section->UserMetricsRecordAction( enabled ? - L"Options_UseSuggestCheckbox_Enable" : - L"Options_UseSuggestCheckbox_Disable", + "Options_UseSuggestCheckbox_Enable" : + "Options_UseSuggestCheckbox_Disable", privacy_section->profile()->GetPrefs()); privacy_section->use_suggest_.SetValue(enabled); } @@ -674,8 +674,8 @@ void PrivacySection::OnDNSPrefetchingChange(GtkWidget* widget, bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); privacy_section->UserMetricsRecordAction( enabled ? - L"Options_DnsPrefetchCheckbox_Enable" : - L"Options_DnsPrefetchCheckbox_Disable", + "Options_DnsPrefetchCheckbox_Enable" : + "Options_DnsPrefetchCheckbox_Disable", privacy_section->profile()->GetPrefs()); privacy_section->dns_prefetch_enabled_.SetValue(enabled); chrome_browser_net::EnableDnsPrefetch(enabled); @@ -689,8 +689,8 @@ void PrivacySection::OnSafeBrowsingChange(GtkWidget* widget, bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); privacy_section->UserMetricsRecordAction( enabled ? - L"Options_SafeBrowsingCheckbox_Enable" : - L"Options_SafeBrowsingCheckbox_Disable", + "Options_SafeBrowsingCheckbox_Enable" : + "Options_SafeBrowsingCheckbox_Disable", privacy_section->profile()->GetPrefs()); privacy_section->safe_browsing_.SetValue(enabled); SafeBrowsingService* safe_browsing_service = @@ -707,8 +707,8 @@ void PrivacySection::OnLoggingChange(GtkWidget* widget, bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); privacy_section->UserMetricsRecordAction( enabled ? - L"Options_MetricsReportingCheckbox_Enable" : - L"Options_MetricsReportingCheckbox_Disable", + "Options_MetricsReportingCheckbox_Enable" : + "Options_MetricsReportingCheckbox_Disable", privacy_section->profile()->GetPrefs()); // Prevent us from being called again by ResolveMetricsReportingEnabled // resetting the checkbox if there was a problem. @@ -731,10 +731,10 @@ void PrivacySection::OnCookieBehaviorChanged(GtkComboBox* combo_box, return; net::CookiePolicy::Type cookie_policy = net::CookiePolicy::FromInt(gtk_combo_box_get_active(combo_box)); - const wchar_t* kUserMetrics[] = { - L"Options_AllowAllCookies", - L"Options_BlockThirdPartyCookies", - L"Options_BlockAllCookies" + const char* kUserMetrics[] = { + "Options_AllowAllCookies", + "Options_BlockThirdPartyCookies", + "Options_BlockAllCookies" }; if (cookie_policy < 0 || static_cast<size_t>(cookie_policy) >= arraysize(kUserMetrics)) { @@ -749,7 +749,7 @@ void PrivacySection::OnCookieBehaviorChanged(GtkComboBox* combo_box, // static void PrivacySection::OnShowCookiesButtonClicked( GtkButton *button, PrivacySection* privacy_section) { - privacy_section->UserMetricsRecordAction(L"Options_ShowCookies", NULL); + privacy_section->UserMetricsRecordAction("Options_ShowCookies", NULL); CookiesView::Show(privacy_section->profile()); } @@ -951,10 +951,10 @@ void SecuritySection::OnRevCheckingEnabledToggled(GtkToggleButton* togglebutton, bool enabled = gtk_toggle_button_get_active(togglebutton); if (enabled) { - section->UserMetricsRecordAction(L"Options_CheckCertRevocation_Enable", + section->UserMetricsRecordAction("Options_CheckCertRevocation_Enable", NULL); } else { - section->UserMetricsRecordAction(L"Options_CheckCertRevocation_Disable", + section->UserMetricsRecordAction("Options_CheckCertRevocation_Disable", NULL); } section->rev_checking_enabled_.SetValue(enabled); @@ -968,9 +968,9 @@ void SecuritySection::OnSSL2EnabledToggled(GtkToggleButton* togglebutton, bool enabled = gtk_toggle_button_get_active(togglebutton); if (enabled) { - section->UserMetricsRecordAction(L"Options_SSL2_Enable", NULL); + section->UserMetricsRecordAction("Options_SSL2_Enable", NULL); } else { - section->UserMetricsRecordAction(L"Options_SSL2_Disable", NULL); + section->UserMetricsRecordAction("Options_SSL2_Disable", NULL); } section->ssl2_enabled_.SetValue(enabled); } @@ -983,9 +983,9 @@ void SecuritySection::OnSSL3EnabledToggled(GtkToggleButton* togglebutton, bool enabled = gtk_toggle_button_get_active(togglebutton); if (enabled) { - section->UserMetricsRecordAction(L"Options_SSL3_Enable", NULL); + section->UserMetricsRecordAction("Options_SSL3_Enable", NULL); } else { - section->UserMetricsRecordAction(L"Options_SSL3_Disable", NULL); + section->UserMetricsRecordAction("Options_SSL3_Disable", NULL); } section->ssl3_enabled_.SetValue(enabled); } @@ -998,9 +998,9 @@ void SecuritySection::OnTLS1EnabledToggled(GtkToggleButton* togglebutton, bool enabled = gtk_toggle_button_get_active(togglebutton); if (enabled) { - section->UserMetricsRecordAction(L"Options_TLS1_Enable", NULL); + section->UserMetricsRecordAction("Options_TLS1_Enable", NULL); } else { - section->UserMetricsRecordAction(L"Options_TLS1_Disable", NULL); + section->UserMetricsRecordAction("Options_TLS1_Disable", NULL); } section->tls1_enabled_.SetValue(enabled); } diff --git a/chrome/browser/gtk/options/advanced_page_gtk.cc b/chrome/browser/gtk/options/advanced_page_gtk.cc index 517669a..4271a33 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.cc +++ b/chrome/browser/gtk/options/advanced_page_gtk.cc @@ -48,7 +48,7 @@ void AdvancedPageGtk::Init() { // static void AdvancedPageGtk::OnResetToDefaultsClicked( GtkButton* button, AdvancedPageGtk* advanced_page) { - advanced_page->UserMetricsRecordAction(L"Options_ResetToDefaults", NULL); + advanced_page->UserMetricsRecordAction("Options_ResetToDefaults", NULL); GtkWidget* dialog_ = gtk_message_dialog_new( GTK_WINDOW(gtk_widget_get_toplevel(advanced_page->page_)), static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL), diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index 196f34c..a694c6f 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -406,7 +406,7 @@ void ContentPageGtk::OnClearBrowsingDataButtonClicked(GtkButton* widget, // static void ContentPageGtk::OnGtkThemeButtonClicked(GtkButton* widget, ContentPageGtk* page) { - page->UserMetricsRecordAction(L"Options_GtkThemeSet", + page->UserMetricsRecordAction("Options_GtkThemeSet", page->profile()->GetPrefs()); page->profile()->SetNativeTheme(); } @@ -414,7 +414,7 @@ void ContentPageGtk::OnGtkThemeButtonClicked(GtkButton* widget, // static void ContentPageGtk::OnResetDefaultThemeButtonClicked(GtkButton* widget, ContentPageGtk* page) { - page->UserMetricsRecordAction(L"Options_ThemesReset", + page->UserMetricsRecordAction("Options_ThemesReset", page->profile()->GetPrefs()); page->profile()->ClearTheme(); } @@ -422,7 +422,7 @@ void ContentPageGtk::OnResetDefaultThemeButtonClicked(GtkButton* widget, // static void ContentPageGtk::OnGetThemesButtonClicked(GtkButton* widget, ContentPageGtk* page) { - page->UserMetricsRecordAction(L"Options_ThemesGallery", + page->UserMetricsRecordAction("Options_ThemesGallery", page->profile()->GetPrefs()); BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate(); } @@ -443,10 +443,10 @@ void ContentPageGtk::OnSystemTitleBarRadioToggled(GtkToggleButton* widget, bool use_custom = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->system_title_bar_hide_radio_)); if (use_custom) { - page->UserMetricsRecordAction(L"Options_CustomFrame_Enable", + page->UserMetricsRecordAction("Options_CustomFrame_Enable", page->profile()->GetPrefs()); } else { - page->UserMetricsRecordAction(L"Options_CustomFrame_Disable", + page->UserMetricsRecordAction("Options_CustomFrame_Disable", page->profile()->GetPrefs()); } @@ -474,10 +474,10 @@ void ContentPageGtk::OnPasswordRadioToggled(GtkToggleButton* widget, bool enabled = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->passwords_asktosave_radio_)); if (enabled) { - page->UserMetricsRecordAction(L"Options_PasswordManager_Enable", + page->UserMetricsRecordAction("Options_PasswordManager_Enable", page->profile()->GetPrefs()); } else { - page->UserMetricsRecordAction(L"Options_PasswordManager_Disable", + page->UserMetricsRecordAction("Options_PasswordManager_Disable", page->profile()->GetPrefs()); } page->ask_to_save_passwords_.SetValue(enabled); @@ -498,10 +498,10 @@ void ContentPageGtk::OnAutofillRadioToggled(GtkToggleButton* widget, bool enabled = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->form_autofill_asktosave_radio_)); if (enabled) { - page->UserMetricsRecordAction(L"Options_FormAutofill_Enable", + page->UserMetricsRecordAction("Options_FormAutofill_Enable", page->profile()->GetPrefs()); } else { - page->UserMetricsRecordAction(L"Options_FormAutofill_Disable", + page->UserMetricsRecordAction("Options_FormAutofill_Disable", page->profile()->GetPrefs()); } page->ask_to_save_form_autofill_.SetValue(enabled); diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc index 58197d2..2054a8a 100644 --- a/chrome/browser/gtk/options/general_page_gtk.cc +++ b/chrome/browser/gtk/options/general_page_gtk.cc @@ -383,13 +383,13 @@ void GeneralPageGtk::OnStartupRadioToggled(GtkToggleButton* toggle_button, general_page->SaveStartupPref(); GtkWidget* sender = GTK_WIDGET(toggle_button); if (sender == general_page->startup_homepage_radio_) { - general_page->UserMetricsRecordAction(L"Options_Startup_Homepage", + general_page->UserMetricsRecordAction("Options_Startup_Homepage", general_page->profile()->GetPrefs()); } else if (sender == general_page->startup_last_session_radio_) { - general_page->UserMetricsRecordAction(L"Options_Startup_LastSession", + general_page->UserMetricsRecordAction("Options_Startup_LastSession", general_page->profile()->GetPrefs()); } else if (sender == general_page->startup_custom_radio_) { - general_page->UserMetricsRecordAction(L"Options_Startup_Custom", + general_page->UserMetricsRecordAction("Options_Startup_Custom", general_page->profile()->GetPrefs()); } } @@ -433,12 +433,12 @@ void GeneralPageGtk::OnNewTabIsHomePageToggled(GtkToggleButton* toggle_button, GtkWidget* sender = GTK_WIDGET(toggle_button); if (sender == general_page->homepage_use_newtab_radio_) { general_page->SetHomepage(GURL()); - general_page->UserMetricsRecordAction(L"Options_Homepage_UseNewTab", + general_page->UserMetricsRecordAction("Options_Homepage_UseNewTab", general_page->profile()->GetPrefs()); gtk_widget_set_sensitive(general_page->homepage_use_url_entry_, FALSE); } else if (sender == general_page->homepage_use_url_radio_) { general_page->SetHomepageFromEntry(); - general_page->UserMetricsRecordAction(L"Options_Homepage_UseURL", + general_page->UserMetricsRecordAction("Options_Homepage_UseURL", general_page->profile()->GetPrefs()); gtk_widget_set_sensitive(general_page->homepage_use_url_entry_, TRUE); } @@ -461,10 +461,10 @@ void GeneralPageGtk::OnShowHomeButtonToggled(GtkToggleButton* toggle_button, bool enabled = gtk_toggle_button_get_active(toggle_button); general_page->show_home_button_.SetValue(enabled); if (enabled) { - general_page->UserMetricsRecordAction(L"Options_Homepage_ShowHomeButton", + general_page->UserMetricsRecordAction("Options_Homepage_ShowHomeButton", general_page->profile()->GetPrefs()); } else { - general_page->UserMetricsRecordAction(L"Options_Homepage_HideHomeButton", + general_page->UserMetricsRecordAction("Options_Homepage_HideHomeButton", general_page->profile()->GetPrefs()); } } @@ -493,7 +493,7 @@ void GeneralPageGtk::OnBrowserUseAsDefaultClicked( // to be notified when that changes. general_page->profile()->GetPrefs()->SetBoolean(prefs::kCheckDefaultBrowser, true); - general_page->UserMetricsRecordAction(L"Options_SetAsDefaultBrowser", + general_page->UserMetricsRecordAction("Options_SetAsDefaultBrowser", general_page->profile()->GetPrefs()); } diff --git a/chrome/browser/gtk/options/languages_page_gtk.cc b/chrome/browser/gtk/options/languages_page_gtk.cc index b58f18f..0cd30d0 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.cc +++ b/chrome/browser/gtk/options/languages_page_gtk.cc @@ -478,7 +478,7 @@ void LanguagesPageGtk::OnDictionaryLanguageChanged() { spellcheck_language_added_ = ""; } - UserMetricsRecordAction(L"Options_DictionaryLanguage", + UserMetricsRecordAction("Options_DictionaryLanguage", profile()->GetPrefs()); dictionary_language_.SetValue(ASCIIToWide(language)); } |