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

Side by Side Diff: ui/app_list/views/search_box_view.cc

Issue 2744463002: Add VectorIconButton functionality to ImageButton. (Closed)
Patch Set: fix cros build Created 3 years, 9 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
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 "ui/app_list/views/search_box_view.h" 5 #include "ui/app_list/views/search_box_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "ui/app_list/app_list_constants.h" 12 #include "ui/app_list/app_list_constants.h"
13 #include "ui/app_list/app_list_model.h" 13 #include "ui/app_list/app_list_model.h"
14 #include "ui/app_list/app_list_switches.h" 14 #include "ui/app_list/app_list_switches.h"
15 #include "ui/app_list/app_list_view_delegate.h" 15 #include "ui/app_list/app_list_view_delegate.h"
16 #include "ui/app_list/resources/grit/app_list_resources.h" 16 #include "ui/app_list/resources/grit/app_list_resources.h"
17 #include "ui/app_list/search_box_model.h" 17 #include "ui/app_list/search_box_model.h"
18 #include "ui/app_list/speech_ui_model.h" 18 #include "ui/app_list/speech_ui_model.h"
19 #include "ui/app_list/views/contents_view.h" 19 #include "ui/app_list/views/contents_view.h"
20 #include "ui/app_list/views/search_box_view_delegate.h" 20 #include "ui/app_list/views/search_box_view_delegate.h"
21 #include "ui/base/ime/text_input_flags.h" 21 #include "ui/base/ime/text_input_flags.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/events/event.h" 24 #include "ui/events/event.h"
25 #include "ui/gfx/canvas.h" 25 #include "ui/gfx/canvas.h"
26 #include "ui/gfx/shadow_value.h" 26 #include "ui/gfx/shadow_value.h"
27 #include "ui/strings/grit/ui_strings.h" 27 #include "ui/strings/grit/ui_strings.h"
28 #include "ui/views/background.h" 28 #include "ui/views/background.h"
29 #include "ui/views/border.h" 29 #include "ui/views/border.h"
30 #include "ui/views/controls/button/image_button.h"
31 #include "ui/views/controls/image_view.h" 30 #include "ui/views/controls/image_view.h"
32 #include "ui/views/controls/textfield/textfield.h" 31 #include "ui/views/controls/textfield/textfield.h"
33 #include "ui/views/layout/box_layout.h" 32 #include "ui/views/layout/box_layout.h"
34 #include "ui/views/layout/fill_layout.h" 33 #include "ui/views/layout/fill_layout.h"
35 #include "ui/views/shadow_border.h" 34 #include "ui/views/shadow_border.h"
36 35
37 namespace app_list { 36 namespace app_list {
38 37
39 namespace { 38 namespace {
40 39
(...skipping 24 matching lines...) Expand all
65 } 64 }
66 65
67 DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground); 66 DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
68 }; 67 };
69 68
70 } // namespace 69 } // namespace
71 70
72 // To paint grey background on mic and back buttons 71 // To paint grey background on mic and back buttons
73 class SearchBoxImageButton : public views::ImageButton { 72 class SearchBoxImageButton : public views::ImageButton {
74 public: 73 public:
75 explicit SearchBoxImageButton(views::ButtonListener* listener) 74 explicit SearchBoxImageButton(views::ImageButtonDelegate* listener)
76 : ImageButton(listener), selected_(false) {} 75 : ImageButton(listener), selected_(false) {}
77 ~SearchBoxImageButton() override {} 76 ~SearchBoxImageButton() override {}
78 77
79 bool selected() { return selected_; } 78 bool selected() { return selected_; }
80 void SetSelected(bool selected) { 79 void SetSelected(bool selected) {
81 if (selected_ == selected) 80 if (selected_ == selected)
82 return; 81 return;
83 82
84 selected_ = selected; 83 selected_ = selected;
85 SchedulePaint(); 84 SchedulePaint();
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 NotifyQueryChanged(); 426 NotifyQueryChanged();
428 } 427 }
429 428
430 void SearchBoxView::OnSpeechRecognitionStateChanged( 429 void SearchBoxView::OnSpeechRecognitionStateChanged(
431 SpeechRecognitionState new_state) { 430 SpeechRecognitionState new_state) {
432 SpeechRecognitionButtonPropChanged(); 431 SpeechRecognitionButtonPropChanged();
433 SchedulePaint(); 432 SchedulePaint();
434 } 433 }
435 434
436 } // namespace app_list 435 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698