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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oshima's comments Created 5 years, 3 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
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shelf/shelf_item_types.h" 10 #include "ash/shelf/shelf_item_types.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 70 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
71 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 71 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
72 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 72 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
73 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 73 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
74 ash::MediaDelegate* CreateMediaDelegate() override; 74 ash::MediaDelegate* CreateMediaDelegate() override;
75 ui::MenuModel* CreateContextMenu(aura::Window* root, 75 ui::MenuModel* CreateContextMenu(aura::Window* root,
76 ash::ShelfItemDelegate* item_delegate, 76 ash::ShelfItemDelegate* item_delegate,
77 ash::ShelfItem* item) override; 77 ash::ShelfItem* item) override;
78 ash::GPUSupport* CreateGPUSupport() override; 78 ash::GPUSupport* CreateGPUSupport() override;
79 base::string16 GetProductName() const override; 79 base::string16 GetProductName() const override;
80 void OpenKeyboardShortcutHelpPage() const override;
81 gfx::Image GetDeprecatedAcceleratorImage() const override;
80 82
81 // content::NotificationObserver override: 83 // content::NotificationObserver override:
82 void Observe(int type, 84 void Observe(int type,
83 const content::NotificationSource& source, 85 const content::NotificationSource& source,
84 const content::NotificationDetails& details) override; 86 const content::NotificationDetails& details) override;
85 87
86 private: 88 private:
87 void PlatformInit(); 89 void PlatformInit();
88 90
89 static ChromeShellDelegate* instance_; 91 static ChromeShellDelegate* instance_;
(...skipping 10 matching lines...) Expand all
100 102
101 #if defined(OS_CHROMEOS) 103 #if defined(OS_CHROMEOS)
102 scoped_ptr<chromeos::DisplayConfigurationObserver> 104 scoped_ptr<chromeos::DisplayConfigurationObserver>
103 display_configuration_observer_; 105 display_configuration_observer_;
104 #endif 106 #endif
105 107
106 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 108 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
107 }; 109 };
108 110
109 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 111 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698