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

Side by Side Diff: ash/shell/shell_delegate_impl.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 | « ash/ash_chromeos_strings.grdp ('k') | ash/shell/shell_delegate_impl.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 ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 56 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
57 ash::SessionStateDelegate* CreateSessionStateDelegate() override; 57 ash::SessionStateDelegate* CreateSessionStateDelegate() override;
58 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 58 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
59 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 59 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
60 ash::MediaDelegate* CreateMediaDelegate() override; 60 ash::MediaDelegate* CreateMediaDelegate() override;
61 ui::MenuModel* CreateContextMenu(aura::Window* root_window, 61 ui::MenuModel* CreateContextMenu(aura::Window* root_window,
62 ash::ShelfItemDelegate* item_delegate, 62 ash::ShelfItemDelegate* item_delegate,
63 ash::ShelfItem* item) override; 63 ash::ShelfItem* item) override;
64 GPUSupport* CreateGPUSupport() override; 64 GPUSupport* CreateGPUSupport() override;
65 base::string16 GetProductName() const override; 65 base::string16 GetProductName() const override;
66 gfx::Image GetDeprecatedAcceleratorImage() const override;
66 67
67 private: 68 private:
68 // Used to update Launcher. Owned by main. 69 // Used to update Launcher. Owned by main.
69 WindowWatcher* watcher_; 70 WindowWatcher* watcher_;
70 71
71 ShelfDelegateImpl* shelf_delegate_; 72 ShelfDelegateImpl* shelf_delegate_;
72 content::BrowserContext* browser_context_; 73 content::BrowserContext* browser_context_;
73 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 74 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
74 75
75 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 76 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
76 }; 77 };
77 78
78 } // namespace shell 79 } // namespace shell
79 } // namespace ash 80 } // namespace ash
80 81
81 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 82 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/ash_chromeos_strings.grdp ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698