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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 2721553004: Remove auto raw pointer deduction from non-linux specific code. (Closed)
Patch Set: rebase 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 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 "ash/public/interfaces/constants.mojom.h" 7 #include "ash/public/interfaces/constants.mojom.h"
8 #include "base/auto_reset.h" 8 #include "base/auto_reset.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "chrome/browser/chromeos/arc/arc_util.h" 10 #include "chrome/browser/chromeos/arc/arc_util.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 ChromeLauncherController::ChromeLauncherController() : observer_binding_(this) { 45 ChromeLauncherController::ChromeLauncherController() : observer_binding_(this) {
46 DCHECK(!instance_); 46 DCHECK(!instance_);
47 instance_ = this; 47 instance_ = this;
48 } 48 }
49 49
50 bool ChromeLauncherController::ConnectToShelfController() { 50 bool ChromeLauncherController::ConnectToShelfController() {
51 if (shelf_controller_.is_bound()) 51 if (shelf_controller_.is_bound())
52 return true; 52 return true;
53 53
54 auto connection = content::ServiceManagerConnection::GetForProcess(); 54 auto* connection = content::ServiceManagerConnection::GetForProcess();
55 auto connector = connection ? connection->GetConnector() : nullptr; 55 auto* connector = connection ? connection->GetConnector() : nullptr;
56 // Unit tests may not have a connector. 56 // Unit tests may not have a connector.
57 if (!connector) 57 if (!connector)
58 return false; 58 return false;
59 59
60 connector->BindInterface(ash::mojom::kServiceName, &shelf_controller_); 60 connector->BindInterface(ash::mojom::kServiceName, &shelf_controller_);
61 return true; 61 return true;
62 } 62 }
63 63
64 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp( 64 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp(
65 const std::string& app_id) { 65 const std::string& app_id) {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // This will uselessly store a preference value for invalid display ids. 182 // This will uselessly store a preference value for invalid display ids.
183 ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id, 183 ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id,
184 auto_hide); 184 auto_hide);
185 } 185 }
186 186
187 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id, 187 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id,
188 const gfx::ImageSkia& image) { 188 const gfx::ImageSkia& image) {
189 // Implemented by subclasses; this should not be called. 189 // Implemented by subclasses; this should not be called.
190 NOTREACHED(); 190 NOTREACHED();
191 } 191 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698