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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "ui/app_list/app_list_constants.h" | 9 #include "ui/app_list/app_list_constants.h" |
10 #include "ui/app_list/app_list_model.h" | 10 #include "ui/app_list/app_list_model.h" |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 views::Widget::InitParams* params, | 318 views::Widget::InitParams* params, |
319 views::Widget* widget) const { | 319 views::Widget* widget) const { |
320 #if defined(USE_AURA) && !defined(OS_CHROMEOS) | 320 #if defined(USE_AURA) && !defined(OS_CHROMEOS) |
321 if (delegate_ && delegate_->ForceNativeDesktop()) | 321 if (delegate_ && delegate_->ForceNativeDesktop()) |
322 params->native_widget = new views::DesktopNativeWidgetAura(widget); | 322 params->native_widget = new views::DesktopNativeWidgetAura(widget); |
323 #endif | 323 #endif |
324 #if defined(OS_LINUX) | 324 #if defined(OS_LINUX) |
325 // Set up a custom WM_CLASS for the app launcher window. This allows task | 325 // Set up a custom WM_CLASS for the app launcher window. This allows task |
326 // switchers in X11 environments to distinguish it from main browser windows. | 326 // switchers in X11 environments to distinguish it from main browser windows. |
327 params->wm_class_name = kAppListWMClass; | 327 params->wm_class_name = kAppListWMClass; |
| 328 // Show the window in the taskbar, even though it is a bubble, which would not |
| 329 // normally be shown. |
| 330 params->override_show_in_taskbar = true; |
328 #endif | 331 #endif |
329 } | 332 } |
330 | 333 |
331 views::View* AppListView::GetInitiallyFocusedView() { | 334 views::View* AppListView::GetInitiallyFocusedView() { |
332 return app_list_main_view_->search_box_view()->search_box(); | 335 return app_list_main_view_->search_box_view()->search_box(); |
333 } | 336 } |
334 | 337 |
335 gfx::ImageSkia AppListView::GetWindowIcon() { | 338 gfx::ImageSkia AppListView::GetWindowIcon() { |
336 if (delegate_) | 339 if (delegate_) |
337 return delegate_->GetWindowIcon(); | 340 return delegate_->GetWindowIcon(); |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 #else | 466 #else |
464 speech_view_->SetVisible(recognizing); | 467 speech_view_->SetVisible(recognizing); |
465 app_list_main_view_->SetVisible(!recognizing); | 468 app_list_main_view_->SetVisible(!recognizing); |
466 #endif | 469 #endif |
467 | 470 |
468 // Needs to schedule paint of AppListView itself, to repaint the background. | 471 // Needs to schedule paint of AppListView itself, to repaint the background. |
469 SchedulePaint(); | 472 SchedulePaint(); |
470 } | 473 } |
471 | 474 |
472 } // namespace app_list | 475 } // namespace app_list |
OLD | NEW |