Commit 710bae69 authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Chromium LUCI CQ

Rename dictation_chromeos* to dictation*

The class DictationChromeos already lives in a ChromeOS-only directory:
chrome/browser/ash/. Remove its suffix.

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1164001
Change-Id: I28ff84b527e3eebc7584b22a7f99a9acdbe4cf04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627371
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Owners-Override: James Cook <jamescook@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844621}
parent 9b917685
......@@ -37,7 +37,7 @@
#include "base/values.h"
#include "chrome/browser/accessibility/accessibility_extension_api.h"
#include "chrome/browser/ash/accessibility/accessibility_extension_loader.h"
#include "chrome/browser/ash/accessibility/dictation_chromeos.h"
#include "chrome/browser/ash/accessibility/dictation.h"
#include "chrome/browser/ash/accessibility/magnification_manager.h"
#include "chrome/browser/ash/accessibility/select_to_speak_event_handler_delegate.h"
#include "chrome/browser/browser_process.h"
......@@ -1555,7 +1555,7 @@ bool AccessibilityManager::ToggleDictation() {
return false;
if (!dictation_.get())
dictation_ = std::make_unique<DictationChromeos>(profile_);
dictation_ = std::make_unique<Dictation>(profile_);
return dictation_->OnToggleDictation();
}
......
......@@ -49,7 +49,7 @@ class Rect;
} // namespace gfx
class AccessibilityExtensionLoader;
class DictationChromeos;
class Dictation;
class SelectToSpeakEventHandlerDelegate;
enum class AccessibilityNotificationType {
......@@ -486,7 +486,7 @@ class AccessibilityManager
bool app_terminating_ = false;
std::unique_ptr<DictationChromeos> dictation_;
std::unique_ptr<Dictation> dictation_;
base::RepeatingCallback<void()> focus_ring_observer_for_test_;
base::RepeatingCallback<void()> select_to_speak_state_observer_for_test_;
......
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ash/accessibility/dictation_chromeos.h"
#include "chrome/browser/ash/accessibility/dictation.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
......@@ -56,18 +56,18 @@ ui::IMEInputContextHandlerInterface* GetInputContext() {
} // namespace
DictationChromeos::DictationChromeos(Profile* profile)
Dictation::Dictation(Profile* profile)
: composition_(std::make_unique<ui::CompositionText>()), profile_(profile) {
if (GetInputContext() && GetInputContext()->GetInputMethod())
GetInputContext()->GetInputMethod()->AddObserver(this);
}
DictationChromeos::~DictationChromeos() {
Dictation::~Dictation() {
if (GetInputContext() && GetInputContext()->GetInputMethod())
GetInputContext()->GetInputMethod()->RemoveObserver(this);
}
bool DictationChromeos::OnToggleDictation() {
bool Dictation::OnToggleDictation() {
if (speech_recognizer_) {
DictationOff();
return false;
......@@ -83,8 +83,7 @@ bool DictationChromeos::OnToggleDictation() {
return true;
}
void DictationChromeos::OnSpeechResult(const base::string16& query,
bool is_final) {
void Dictation::OnSpeechResult(const base::string16& query, bool is_final) {
composition_->text = query;
if (!is_final) {
......@@ -100,9 +99,9 @@ void DictationChromeos::OnSpeechResult(const base::string16& query,
DictationOff();
}
void DictationChromeos::OnSpeechSoundLevelChanged(int16_t level) {}
void Dictation::OnSpeechSoundLevelChanged(int16_t level) {}
void DictationChromeos::OnSpeechRecognitionStateChanged(
void Dictation::OnSpeechRecognitionStateChanged(
SpeechRecognizerStatus new_state) {
if (new_state == SPEECH_RECOGNIZER_RECOGNIZING)
audio::SoundsManager::Get()->Play(
......@@ -113,11 +112,10 @@ void DictationChromeos::OnSpeechRecognitionStateChanged(
DictationOff();
}
void DictationChromeos::GetSpeechAuthParameters(std::string* auth_scope,
std::string* auth_token) {}
void Dictation::GetSpeechAuthParameters(std::string* auth_scope,
std::string* auth_token) {}
void DictationChromeos::OnTextInputStateChanged(
const ui::TextInputClient* client) {
void Dictation::OnTextInputStateChanged(const ui::TextInputClient* client) {
if (!client)
return;
......@@ -128,7 +126,7 @@ void DictationChromeos::OnTextInputStateChanged(
DictationOff();
}
void DictationChromeos::DictationOff() {
void Dictation::DictationOff() {
if (!speech_recognizer_)
return;
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_ASH_ACCESSIBILITY_DICTATION_CHROMEOS_H_
#define CHROME_BROWSER_ASH_ACCESSIBILITY_DICTATION_CHROMEOS_H_
#ifndef CHROME_BROWSER_ASH_ACCESSIBILITY_DICTATION_H_
#define CHROME_BROWSER_ASH_ACCESSIBILITY_DICTATION_H_
#include <memory>
#include <string>
......@@ -22,11 +22,11 @@ class Profile;
class SpeechRecognizer;
// Provides global dictation (type what you speak) on Chrome OS.
class DictationChromeos : public SpeechRecognizerDelegate,
public ui::InputMethodObserver {
class Dictation : public SpeechRecognizerDelegate,
public ui::InputMethodObserver {
public:
explicit DictationChromeos(Profile* profile);
~DictationChromeos() override;
explicit Dictation(Profile* profile);
~Dictation() override;
// User-initiated dictation.
bool OnToggleDictation();
......@@ -58,9 +58,9 @@ class DictationChromeos : public SpeechRecognizerDelegate,
Profile* profile_;
base::WeakPtrFactory<DictationChromeos> weak_ptr_factory_{this};
base::WeakPtrFactory<Dictation> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(DictationChromeos);
DISALLOW_COPY_AND_ASSIGN(Dictation);
};
#endif // CHROME_BROWSER_ASH_ACCESSIBILITY_DICTATION_CHROMEOS_H_
#endif // CHROME_BROWSER_ASH_ACCESSIBILITY_DICTATION_H_
......@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ash/accessibility/dictation.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/ash/accessibility/dictation_chromeos.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/test/browser_test.h"
#include "ui/base/ime/chromeos/ime_bridge.h"
......
......@@ -434,8 +434,8 @@ source_set("chromeos") {
"../ash/accessibility/accessibility_panel.h",
"../ash/accessibility/chromevox_panel.cc",
"../ash/accessibility/chromevox_panel.h",
"../ash/accessibility/dictation_chromeos.cc",
"../ash/accessibility/dictation_chromeos.h",
"../ash/accessibility/dictation.cc",
"../ash/accessibility/dictation.h",
"../ash/accessibility/event_handler_common.cc",
"../ash/accessibility/event_handler_common.h",
"../ash/accessibility/magnification_manager.cc",
......
......@@ -2391,7 +2391,7 @@ if (!is_android) {
"../browser/apps/platform_apps/app_window_interactive_uitest_base.h",
"../browser/ash/accessibility/accessibility_common_browsertest.cc",
"../browser/ash/accessibility/accessibility_manager_browsertest.cc",
"../browser/ash/accessibility/dictation_chromeos_browsertest.cc",
"../browser/ash/accessibility/dictation_browsertest.cc",
"../browser/ash/accessibility/magnification_controller_browsertest.cc",
"../browser/ash/accessibility/magnification_manager_browsertest.cc",
"../browser/ash/accessibility/select_to_speak_browsertest.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment