chrome/browser/ui/ash/volume_controller.h - Issue 2552483002: mash: Have chrome set itself as a controller interface for changing volume

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/volume_controller.h

Issue 2552483002: mash: Have chrome set itself as a controller interface for changing volume (Closed)

Patch Set: rebase Created 4 years 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 side-by-side diff with in-line comments

Download patch

« ash/public/interfaces/volume.mojom ('K') | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/volume_controller.cc » ('j') | chrome/browser/ui/ash/volume_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/volume_controller.h

diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.h b/chrome/browser/ui/ash/volume_controller.h

similarity index 49%

rename from chrome/browser/ui/ash/volume_controller_chromeos.h

rename to chrome/browser/ui/ash/volume_controller.h

index 532b3bafc0d73b90c5cf78706e3496dbde746f6d..b90a5c0a4b1a451f3ee197c918b2175bcb6192b1 100644

--- a/chrome/browser/ui/ash/volume_controller_chromeos.h

+++ b/chrome/browser/ui/ash/volume_controller.h

@@ -2,31 +2,28 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_

-#define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_

+#ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_H_

+#define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_H_

#include "ash/public/interfaces/volume.mojom.h"

#include "base/macros.h"

-#include "mojo/public/cpp/bindings/binding_set.h"

+#include "mojo/public/cpp/bindings/binding.h"

// Controls the volume when F8-10 or a multimedia key for volume is pressed.

msw 2016/12/05 20:15:09 optional nit: add a TODO about broken accelerators

James Cook 2016/12/06 19:23:57 Done.

-class VolumeController : public ash::mojom::VolumeController {

+class VolumeController : public ash::mojom::VolumeClient {

msw 2016/12/05 20:15:09 Yeah, the controller implementing a client, just d

James Cook 2016/12/06 19:23:57 Done.

public:

VolumeController();

~VolumeController() override;

- // Binds the mojom::VolumeController interface request to this object.

- void BindRequest(ash::mojom::VolumeControllerRequest request);

- // Overridden from ash::mojom::VolumeController:

+ // Overridden from ash::mojom::VolumeClient:

void VolumeMute() override;

void VolumeDown() override;

void VolumeUp() override;

private:

- mojo::BindingSet<ash::mojom::VolumeController> bindings_;

+ mojo::Binding<ash::mojom::VolumeClient> binding_;

DISALLOW_COPY_AND_ASSIGN(VolumeController);

};

-#endif // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_

+#endif // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_H_

« ash/public/interfaces/volume.mojom ('K') | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/volume_controller.cc » ('j') | chrome/browser/ui/ash/volume_controller.cc » ('J')