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

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

Issue 9124021: Adds Ctrl-Shift-Q support inside AppList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed extraneous import 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
« no previous file with comments | « chrome/browser/ui/views/aura/chrome_shell_delegate.h ('k') | no next file » | 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 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/wm/window_util.h" 8 #include "ash/wm/window_util.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/defaults.h" 10 #include "chrome/browser/defaults.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 Browser::OpenEmptyWindow(profile); 81 Browser::OpenEmptyWindow(profile);
82 } 82 }
83 83
84 views::Widget* ChromeShellDelegate::CreateStatusArea() { 84 views::Widget* ChromeShellDelegate::CreateStatusArea() {
85 status_area_host_.reset(new StatusAreaHostAura()); 85 status_area_host_.reset(new StatusAreaHostAura());
86 views::Widget* status_area_widget = 86 views::Widget* status_area_widget =
87 status_area_host_.get()->CreateStatusArea(); 87 status_area_host_.get()->CreateStatusArea();
88 return status_area_widget; 88 return status_area_widget;
89 } 89 }
90 90
91 void ChromeShellDelegate::Exit() {
92 BrowserList::AttemptUserExit();
93 }
94
91 void ChromeShellDelegate::BuildAppListModel(ash::AppListModel* model) { 95 void ChromeShellDelegate::BuildAppListModel(ash::AppListModel* model) {
92 AppListModelBuilder builder(ProfileManager::GetDefaultProfile(), 96 AppListModelBuilder builder(ProfileManager::GetDefaultProfile(),
93 model); 97 model);
94 builder.Build(); 98 builder.Build();
95 } 99 }
96 100
97 ash::AppListViewDelegate* 101 ash::AppListViewDelegate*
98 ChromeShellDelegate::CreateAppListViewDelegate() { 102 ChromeShellDelegate::CreateAppListViewDelegate() {
99 // Shell will own the created delegate. 103 // Shell will own the created delegate.
100 return new AppListViewDelegate; 104 return new AppListViewDelegate;
(...skipping 29 matching lines...) Expand all
130 bool ChromeShellDelegate::ConfigureLauncherItem( 134 bool ChromeShellDelegate::ConfigureLauncherItem(
131 ash::LauncherItem* item) { 135 ash::LauncherItem* item) {
132 BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window); 136 BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window);
133 return view && 137 return view &&
134 ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type)); 138 ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));
135 } 139 }
136 140
137 int ChromeShellDelegate::GetBrowserShortcutResourceId() { 141 int ChromeShellDelegate::GetBrowserShortcutResourceId() {
138 return IDR_PRODUCT_LOGO_32; 142 return IDR_PRODUCT_LOGO_32;
139 } 143 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/aura/chrome_shell_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698