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

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

Issue 2276233002: ash/chromeos: Add shift-alt-p shortcut to open palette. (Closed)
Patch Set: Address comments Created 4 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/shell/shell_delegate_impl.cc ('k') | chrome/browser/ui/ash/palette_delegate_chromeos.h » ('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 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { 498 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() {
499 return new ChromeNewWindowDelegate; 499 return new ChromeNewWindowDelegate;
500 } 500 }
501 501
502 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { 502 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
503 return new MediaDelegateChromeOS; 503 return new MediaDelegateChromeOS;
504 } 504 }
505 505
506 std::unique_ptr<ash::PaletteDelegate> 506 std::unique_ptr<ash::PaletteDelegate>
507 ChromeShellDelegate::CreatePaletteDelegate() { 507 ChromeShellDelegate::CreatePaletteDelegate() {
508 return base::WrapUnique(new chromeos::PaletteDelegateChromeOS()); 508 return chromeos::PaletteDelegateChromeOS::Create();
509 } 509 }
510 510
511 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { 511 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
512 return chromeos::CreateSystemTrayDelegate(); 512 return chromeos::CreateSystemTrayDelegate();
513 } 513 }
514 514
515 std::unique_ptr<ash::WallpaperDelegate> 515 std::unique_ptr<ash::WallpaperDelegate>
516 ChromeShellDelegate::CreateWallpaperDelegate() { 516 ChromeShellDelegate::CreateWallpaperDelegate() {
517 return base::WrapUnique(chromeos::CreateWallpaperDelegate()); 517 return base::WrapUnique(chromeos::CreateWallpaperDelegate());
518 } 518 }
(...skipping 29 matching lines...) Expand all
548 NOTREACHED() << "Unexpected notification " << type; 548 NOTREACHED() << "Unexpected notification " << type;
549 } 549 }
550 } 550 }
551 551
552 void ChromeShellDelegate::PlatformInit() { 552 void ChromeShellDelegate::PlatformInit() {
553 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 553 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
554 content::NotificationService::AllSources()); 554 content::NotificationService::AllSources());
555 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 555 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
556 content::NotificationService::AllSources()); 556 content::NotificationService::AllSources());
557 } 557 }
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | chrome/browser/ui/ash/palette_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698