OLD | NEW |
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/app_list_view.h" | 5 #include "ui/app_list/views/app_list_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 app_list_main_view_)); | 326 app_list_main_view_)); |
327 | 327 |
328 // On non-aura the bubble has two widgets, and it's possible for the border | 328 // On non-aura the bubble has two widgets, and it's possible for the border |
329 // to be shown independently in odd situations. Explicitly hide the bubble | 329 // to be shown independently in odd situations. Explicitly hide the bubble |
330 // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the | 330 // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the |
331 // window manager do not have the SWP_SHOWWINDOW flag set which would cause | 331 // window manager do not have the SWP_SHOWWINDOW flag set which would cause |
332 // the border to be shown. See http://crbug.com/231687 . | 332 // the border to be shown. See http://crbug.com/231687 . |
333 GetWidget()->Hide(); | 333 GetWidget()->Hide(); |
334 #endif | 334 #endif |
335 | 335 |
336 OnSpeechRecognitionStateChanged(delegate_->GetSpeechUI()->state()); | |
337 | |
338 if (delegate_) | 336 if (delegate_) |
339 delegate_->ViewInitialized(); | 337 delegate_->ViewInitialized(); |
340 } | 338 } |
341 | 339 |
342 void AppListView::OnBeforeBubbleWidgetInit( | 340 void AppListView::OnBeforeBubbleWidgetInit( |
343 views::Widget::InitParams* params, | 341 views::Widget::InitParams* params, |
344 views::Widget* widget) const { | 342 views::Widget* widget) const { |
345 #if defined(USE_AURA) && !defined(OS_CHROMEOS) | 343 #if defined(USE_AURA) && !defined(OS_CHROMEOS) |
346 if (delegate_ && delegate_->ForceNativeDesktop()) | 344 if (delegate_ && delegate_->ForceNativeDesktop()) |
347 params->native_widget = new views::DesktopNativeWidgetAura(widget); | 345 params->native_widget = new views::DesktopNativeWidgetAura(widget); |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 #else | 510 #else |
513 speech_view_->SetVisible(recognizing); | 511 speech_view_->SetVisible(recognizing); |
514 app_list_main_view_->SetVisible(!recognizing); | 512 app_list_main_view_->SetVisible(!recognizing); |
515 | 513 |
516 // Needs to schedule paint of AppListView itself, to repaint the background. | 514 // Needs to schedule paint of AppListView itself, to repaint the background. |
517 GetBubbleFrameView()->SchedulePaint(); | 515 GetBubbleFrameView()->SchedulePaint(); |
518 #endif | 516 #endif |
519 } | 517 } |
520 | 518 |
521 } // namespace app_list | 519 } // namespace app_list |
OLD | NEW |