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

Unified Diff: ui/app_list/views/speech_view.cc

Issue 645853013: Remove some platform specific stuff from views. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/speech_view.h ('k') | ui/app_list/views/speech_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/speech_view.cc
diff --git a/ui/app_list/views/speech_view.cc b/ui/app_list/views/speech_view.cc
deleted file mode 100644
index 82e5f3c846479778ebae75796ceab3f3079f8f14..0000000000000000000000000000000000000000
--- a/ui/app_list/views/speech_view.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/app_list/views/speech_view.h"
-
-#include "base/strings/utf_string_conversions.h"
-#include "third_party/skia/include/core/SkPath.h"
-#include "ui/app_list/app_list_model.h"
-#include "ui/app_list/app_list_view_delegate.h"
-#include "ui/app_list/speech_ui_model.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/path.h"
-#include "ui/resources/grit/ui_resources.h"
-#include "ui/strings/grit/ui_strings.h"
-#include "ui/views/animation/bounds_animator.h"
-#include "ui/views/background.h"
-#include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/layout/fill_layout.h"
-#include "ui/views/masked_targeter_delegate.h"
-#include "ui/views/shadow_border.h"
-
-namespace app_list {
-
-namespace {
-
-const int kShadowOffset = 1;
-const int kShadowBlur = 4;
-const int kSpeechViewMaxHeight = 300;
-const int kMicButtonMargin = 12;
-const int kTextMargin = 32;
-const int kLogoMarginLeft = 30;
-const int kLogoMarginTop = 28;
-const int kLogoWidth = 104;
-const int kLogoHeight = 36;
-const int kIndicatorCenterOffsetY = -1;
-const int kIndicatorRadiusMinOffset = -3;
-const int kIndicatorRadiusMax = 100;
-const int kIndicatorAnimationDuration = 100;
-const SkColor kShadowColor = SkColorSetARGB(0.3 * 255, 0, 0, 0);
-const SkColor kHintTextColor = SkColorSetRGB(119, 119, 119);
-const SkColor kResultTextColor = SkColorSetRGB(178, 178, 178);
-const SkColor kSoundLevelIndicatorColor = SkColorSetRGB(219, 219, 219);
-
-class SoundLevelIndicator : public views::View {
- public:
- SoundLevelIndicator();
- virtual ~SoundLevelIndicator();
-
- private:
- // Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override;
-
- DISALLOW_COPY_AND_ASSIGN(SoundLevelIndicator);
-};
-
-SoundLevelIndicator::SoundLevelIndicator() {}
-
-SoundLevelIndicator::~SoundLevelIndicator() {}
-
-void SoundLevelIndicator::OnPaint(gfx::Canvas* canvas) {
- SkPaint paint;
- paint.setStyle(SkPaint::kFill_Style);
- paint.setColor(kSoundLevelIndicatorColor);
- paint.setAntiAlias(true);
- canvas->DrawCircle(bounds().CenterPoint(), width() / 2, paint);
-}
-
-// MicButton is an image button with a circular hit test mask.
-class MicButton : public views::ImageButton,
- public views::MaskedTargeterDelegate {
- public:
- explicit MicButton(views::ButtonListener* listener);
- virtual ~MicButton();
-
- private:
- // views::MaskedTargeterDelegate:
- virtual bool GetHitTestMask(gfx::Path* mask) const override;
-
- DISALLOW_COPY_AND_ASSIGN(MicButton);
-};
-
-MicButton::MicButton(views::ButtonListener* listener)
- : views::ImageButton(listener) {}
-
-MicButton::~MicButton() {}
-
-bool MicButton::GetHitTestMask(gfx::Path* mask) const {
- DCHECK(mask);
-
- // The mic button icon is a circle.
- gfx::Rect local_bounds = GetLocalBounds();
- int radius = local_bounds.width() / 2 + kIndicatorRadiusMinOffset;
- gfx::Point center = local_bounds.CenterPoint();
- center.set_y(center.y() + kIndicatorCenterOffsetY);
- mask->addCircle(SkIntToScalar(center.x()),
- SkIntToScalar(center.y()),
- SkIntToScalar(radius));
- return true;
-}
-
-} // namespace
-
-// static
-
-SpeechView::SpeechView(AppListViewDelegate* delegate)
- : delegate_(delegate),
- logo_(NULL) {
- SetBorder(scoped_ptr<views::Border>(
- new views::ShadowBorder(kShadowBlur,
- kShadowColor,
- kShadowOffset, // Vertical offset.
- 0)));
-
- // To keep the painting order of the border and the background, this class
- // actually has a single child of 'container' which has white background and
- // contains all components.
- views::View* container = new views::View();
- container->set_background(
- views::Background::CreateSolidBackground(SK_ColorWHITE));
-
- const gfx::ImageSkia& logo_image = delegate_->GetSpeechUI()->logo();
- if (!logo_image.isNull()) {
- logo_ = new views::ImageView();
- logo_->SetImage(&logo_image);
- container->AddChildView(logo_);
- }
-
- indicator_ = new SoundLevelIndicator();
- indicator_->SetVisible(false);
- container->AddChildView(indicator_);
-
- MicButton* mic_button = new MicButton(this);
- mic_button_ = mic_button;
- container->AddChildView(mic_button_);
- mic_button_->SetEventTargeter(
- scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(mic_button)));
-
- // TODO(mukai): use BoundedLabel to cap 2 lines.
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- speech_result_ = new views::Label(
- base::string16(), bundle.GetFontList(ui::ResourceBundle::LargeFont));
- speech_result_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-
- speech_result_->SetMultiLine(true);
- container->AddChildView(speech_result_);
-
- AddChildView(container);
-
- delegate_->GetSpeechUI()->AddObserver(this);
- indicator_animator_.reset(new views::BoundsAnimator(container));
- indicator_animator_->SetAnimationDuration(kIndicatorAnimationDuration);
- indicator_animator_->set_tween_type(gfx::Tween::LINEAR);
-
- Reset();
-}
-
-SpeechView::~SpeechView() {
- delegate_->GetSpeechUI()->RemoveObserver(this);
-}
-
-void SpeechView::Reset() {
- OnSpeechRecognitionStateChanged(delegate_->GetSpeechUI()->state());
-}
-
-int SpeechView::GetIndicatorRadius(uint8 level) {
- int radius_min = mic_button_->width() / 2 + kIndicatorRadiusMinOffset;
- int range = kIndicatorRadiusMax - radius_min;
- return level * range / kuint8max + radius_min;
-}
-
-void SpeechView::Layout() {
- views::View* container = child_at(0);
- container->SetBoundsRect(GetContentsBounds());
-
- // Because container is a pure View, this class should layout its children.
- const gfx::Rect contents_bounds = container->GetContentsBounds();
- if (logo_)
- logo_->SetBounds(kLogoMarginLeft, kLogoMarginTop, kLogoWidth, kLogoHeight);
- gfx::Size mic_size = mic_button_->GetPreferredSize();
- gfx::Point mic_origin(
- contents_bounds.right() - kMicButtonMargin - mic_size.width(),
- contents_bounds.y() + kMicButtonMargin);
- mic_button_->SetBoundsRect(gfx::Rect(mic_origin, mic_size));
-
- int speech_width = contents_bounds.width() - kTextMargin * 2;
- speech_result_->SizeToFit(speech_width);
- int speech_height = speech_result_->GetHeightForWidth(speech_width);
- speech_result_->SetBounds(
- contents_bounds.x() + kTextMargin,
- contents_bounds.bottom() - kTextMargin - speech_height,
- speech_width,
- speech_height);
-}
-
-gfx::Size SpeechView::GetPreferredSize() const {
- return gfx::Size(0, kSpeechViewMaxHeight);
-}
-
-void SpeechView::ButtonPressed(views::Button* sender, const ui::Event& event) {
- delegate_->ToggleSpeechRecognition();
-}
-
-void SpeechView::OnSpeechSoundLevelChanged(uint8 level) {
- if (!visible() ||
- delegate_->GetSpeechUI()->state() == SPEECH_RECOGNITION_NETWORK_ERROR)
- return;
-
- gfx::Point origin = mic_button_->bounds().CenterPoint();
- int radius = GetIndicatorRadius(level);
- origin.Offset(-radius, -radius + kIndicatorCenterOffsetY);
- gfx::Rect indicator_bounds =
- gfx::Rect(origin, gfx::Size(radius * 2, radius * 2));
- if (indicator_->visible()) {
- indicator_animator_->AnimateViewTo(indicator_, indicator_bounds);
- } else {
- indicator_->SetVisible(true);
- indicator_->SetBoundsRect(indicator_bounds);
- }
-}
-
-void SpeechView::OnSpeechResult(const base::string16& result,
- bool is_final) {
- speech_result_->SetText(result);
- speech_result_->SetEnabledColor(kResultTextColor);
-}
-
-void SpeechView::OnSpeechRecognitionStateChanged(
- SpeechRecognitionState new_state) {
- int resource_id = IDR_APP_LIST_SPEECH_MIC_OFF;
- if (new_state == SPEECH_RECOGNITION_RECOGNIZING)
- resource_id = IDR_APP_LIST_SPEECH_MIC_ON;
- else if (new_state == SPEECH_RECOGNITION_IN_SPEECH)
- resource_id = IDR_APP_LIST_SPEECH_MIC_RECORDING;
-
- int text_resource_id = IDS_APP_LIST_SPEECH_HINT_TEXT;
-
- if (new_state == SPEECH_RECOGNITION_NETWORK_ERROR) {
- text_resource_id = IDS_APP_LIST_SPEECH_NETWORK_ERROR_HINT_TEXT;
- indicator_->SetVisible(false);
- }
- speech_result_->SetText(l10n_util::GetStringUTF16(text_resource_id));
- speech_result_->SetEnabledColor(kHintTextColor);
-
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- mic_button_->SetImage(views::Button::STATE_NORMAL,
- bundle.GetImageSkiaNamed(resource_id));
-}
-
-} // namespace app_list
« no previous file with comments | « ui/app_list/views/speech_view.h ('k') | ui/app_list/views/speech_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698