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

Side by Side Diff: chrome/browser/ui/views/aura/chrome_shell_delegate.h

Issue 9132004: Makes Ctrl-Shift-L work in AppList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed accelerator_table Created 8 years, 11 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 | Annotate | Revision Log
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_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 24 matching lines...) Expand all
35 35
36 // Returns whether a launcher item should be created for |browser|. If an item 36 // Returns whether a launcher item should be created for |browser|. If an item
37 // should be created |type| is set to the launcher type to create. 37 // should be created |type| is set to the launcher type to create.
38 static bool ShouldCreateLauncherItemForBrowser( 38 static bool ShouldCreateLauncherItemForBrowser(
39 Browser* browser, 39 Browser* browser,
40 ash::LauncherItemType* type); 40 ash::LauncherItemType* type);
41 41
42 // ash::ShellDelegate overrides; 42 // ash::ShellDelegate overrides;
43 virtual void CreateNewWindow() OVERRIDE; 43 virtual void CreateNewWindow() OVERRIDE;
44 virtual views::Widget* CreateStatusArea() OVERRIDE; 44 virtual views::Widget* CreateStatusArea() OVERRIDE;
45 #if defined(OS_CHROMEOS)
46 virtual void LockScreen() OVERRIDE;
47 #endif
45 virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE; 48 virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE;
46 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 49 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
47 virtual std::vector<aura::Window*> GetCycleWindowList( 50 virtual std::vector<aura::Window*> GetCycleWindowList(
48 CycleSource source, 51 CycleSource source,
49 CycleOrder order) const OVERRIDE; 52 CycleOrder order) const OVERRIDE;
50 virtual void LauncherItemClicked( 53 virtual void LauncherItemClicked(
51 const ash::LauncherItem& item) OVERRIDE; 54 const ash::LauncherItem& item) OVERRIDE;
52 virtual bool ConfigureLauncherItem(ash::LauncherItem* item) OVERRIDE; 55 virtual bool ConfigureLauncherItem(ash::LauncherItem* item) OVERRIDE;
53 virtual int GetBrowserShortcutResourceId() OVERRIDE; 56 virtual int GetBrowserShortcutResourceId() OVERRIDE;
54 57
55 private: 58 private:
56 static ChromeShellDelegate* instance_; 59 static ChromeShellDelegate* instance_;
57 60
58 scoped_ptr<StatusAreaHostAura> status_area_host_; 61 scoped_ptr<StatusAreaHostAura> status_area_host_;
59 62
60 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 63 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
61 }; 64 };
62 65
63 #endif // CHROME_BROWSER_UI_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_ 66 #endif // CHROME_BROWSER_UI_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | chrome/browser/ui/views/aura/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698