OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "chrome/browser/extensions/extension_app_icon_loader.h" | 8 #include "chrome/browser/extensions/extension_app_icon_loader.h" |
9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
10 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h" | 10 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h" |
11 #include "chrome/browser/ui/ash/ash_util.h" | 11 #include "chrome/browser/ui/ash/ash_util.h" |
12 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 12 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
13 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" | 13 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" |
14 #include "content/public/common/service_manager_connection.h" | 14 #include "content/public/common/service_manager_connection.h" |
15 #include "services/shell/public/cpp/connector.h" | 15 #include "services/service_manager/public/cpp/connector.h" |
16 #include "ui/display/display.h" | 16 #include "ui/display/display.h" |
17 #include "ui/display/screen.h" | 17 #include "ui/display/screen.h" |
18 | 18 |
19 // static | 19 // static |
20 ChromeLauncherController* ChromeLauncherController::instance_ = nullptr; | 20 ChromeLauncherController* ChromeLauncherController::instance_ = nullptr; |
21 | 21 |
22 ChromeLauncherController::~ChromeLauncherController() { | 22 ChromeLauncherController::~ChromeLauncherController() { |
23 if (instance_ == this) | 23 if (instance_ == this) |
24 instance_ = nullptr; | 24 instance_ = nullptr; |
25 } | 25 } |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 // TODO(msw): Avoid handling this pref change and forwarding the value to ash. | 179 // TODO(msw): Avoid handling this pref change and forwarding the value to ash. |
180 ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id, | 180 ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id, |
181 auto_hide); | 181 auto_hide); |
182 } | 182 } |
183 | 183 |
184 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id, | 184 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id, |
185 const gfx::ImageSkia& image) { | 185 const gfx::ImageSkia& image) { |
186 // Implemented by subclasses; this should not be called. | 186 // Implemented by subclasses; this should not be called. |
187 NOTREACHED(); | 187 NOTREACHED(); |
188 } | 188 } |
OLD | NEW |