| 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 "chrome/browser/ui/app_list/app_list_view_delegate.h" | 5 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "apps/custom_launcher_page_contents.h" | 9 #include "apps/custom_launcher_page_contents.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "extensions/common/extension_set.h" | 56 #include "extensions/common/extension_set.h" |
| 57 #include "extensions/common/manifest_constants.h" | 57 #include "extensions/common/manifest_constants.h" |
| 58 #include "extensions/common/manifest_handlers/launcher_page_info.h" | 58 #include "extensions/common/manifest_handlers/launcher_page_info.h" |
| 59 #include "grit/theme_resources.h" | 59 #include "grit/theme_resources.h" |
| 60 #include "ui/app_list/app_list_switches.h" | 60 #include "ui/app_list/app_list_switches.h" |
| 61 #include "ui/app_list/app_list_view_delegate_observer.h" | 61 #include "ui/app_list/app_list_view_delegate_observer.h" |
| 62 #include "ui/app_list/search_box_model.h" | 62 #include "ui/app_list/search_box_model.h" |
| 63 #include "ui/app_list/search_controller.h" | 63 #include "ui/app_list/search_controller.h" |
| 64 #include "ui/app_list/speech_ui_model.h" | 64 #include "ui/app_list/speech_ui_model.h" |
| 65 #include "ui/base/resource/resource_bundle.h" | 65 #include "ui/base/resource/resource_bundle.h" |
| 66 #include "ui/gfx/host_desktop_type.h" |
| 66 #include "ui/views/controls/webview/webview.h" | 67 #include "ui/views/controls/webview/webview.h" |
| 67 | 68 |
| 68 #if defined(TOOLKIT_VIEWS) | 69 #if defined(TOOLKIT_VIEWS) |
| 69 #include "ui/views/controls/webview/webview.h" | 70 #include "ui/views/controls/webview/webview.h" |
| 70 #endif | 71 #endif |
| 71 | 72 |
| 72 #if defined(USE_AURA) | 73 #if defined(USE_AURA) |
| 73 #include "ui/keyboard/keyboard_util.h" | 74 #include "ui/keyboard/keyboard_util.h" |
| 74 #endif | 75 #endif |
| 75 | 76 |
| (...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 | 816 |
| 816 // SigninManagerFactory is not a leaky singleton (unlike this class), and | 817 // SigninManagerFactory is not a leaky singleton (unlike this class), and |
| 817 // its destructor will check that it has no remaining observers. | 818 // its destructor will check that it has no remaining observers. |
| 818 scoped_observer_.RemoveAll(); | 819 scoped_observer_.RemoveAll(); |
| 819 SigninManagerFactory::GetInstance()->RemoveObserver(this); | 820 SigninManagerFactory::GetInstance()->RemoveObserver(this); |
| 820 break; | 821 break; |
| 821 default: | 822 default: |
| 822 NOTREACHED(); | 823 NOTREACHED(); |
| 823 } | 824 } |
| 824 } | 825 } |
| OLD | NEW |