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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_media_menu_model.h

Issue 2133013002: AcceleratorProvider: Make GetAcceleratorForCommandId const. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix overrides on Mac and Chrome OS. Created 4 years, 5 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 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_MEDIA_MENU_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_MEDIA_MENU_MODEL_H_
6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_MEDIA_MENU_MODEL_H_ 6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_MEDIA_MENU_MODEL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 17 matching lines...) Expand all
28 ContentSettingMediaMenuModel( 28 ContentSettingMediaMenuModel(
29 content::MediaStreamType type, 29 content::MediaStreamType type,
30 ContentSettingBubbleModel* bubble_model, 30 ContentSettingBubbleModel* bubble_model,
31 const MenuLabelChangedCallback& callback); 31 const MenuLabelChangedCallback& callback);
32 ~ContentSettingMediaMenuModel() override; 32 ~ContentSettingMediaMenuModel() override;
33 33
34 // ui::SimpleMenuModel::Delegate: 34 // ui::SimpleMenuModel::Delegate:
35 bool IsCommandIdChecked(int command_id) const override; 35 bool IsCommandIdChecked(int command_id) const override;
36 bool IsCommandIdEnabled(int command_id) const override; 36 bool IsCommandIdEnabled(int command_id) const override;
37 bool GetAcceleratorForCommandId(int command_id, 37 bool GetAcceleratorForCommandId(int command_id,
38 ui::Accelerator* accelerator) override; 38 ui::Accelerator* accelerator) const override;
39 void ExecuteCommand(int command_id, int event_flags) override; 39 void ExecuteCommand(int command_id, int event_flags) override;
40 40
41 private: 41 private:
42 typedef std::map<int, content::MediaStreamDevice> CommandMap; 42 typedef std::map<int, content::MediaStreamDevice> CommandMap;
43 43
44 content::MediaStreamType type_; 44 content::MediaStreamType type_;
45 ContentSettingBubbleModel* media_bubble_model_; // Weak. 45 ContentSettingBubbleModel* media_bubble_model_; // Weak.
46 MenuLabelChangedCallback callback_; 46 MenuLabelChangedCallback callback_;
47 CommandMap commands_; 47 CommandMap commands_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ContentSettingMediaMenuModel); 49 DISALLOW_COPY_AND_ASSIGN(ContentSettingMediaMenuModel);
50 }; 50 };
51 51
52 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_MEDIA_MENU_MODEL_H _ 52 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_MEDIA_MENU_MODEL_H _
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_controller.mm ('k') | chrome/browser/ui/content_settings/content_setting_media_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698