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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 459
460 if (!browser) { 460 if (!browser) {
461 browser = new Browser(Browser::CreateParams(profile)); 461 browser = new Browser(Browser::CreateParams(profile));
462 browser->window()->Show(); 462 browser->window()->Show();
463 } 463 }
464 464
465 browser->window()->Activate(); 465 browser->window()->Activate();
466 466
467 chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl), 467 chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl),
468 ui::PAGE_TRANSITION_AUTO_BOOKMARK); 468 ui::PAGE_TRANSITION_AUTO_BOOKMARK);
469 params.disposition = SINGLETON_TAB; 469 params.disposition = WindowOpenDisposition::SINGLETON_TAB;
470 chrome::Navigate(&params); 470 chrome::Navigate(&params);
471 } 471 }
472 472
473 gfx::Image ChromeShellDelegate::GetDeprecatedAcceleratorImage() const { 473 gfx::Image ChromeShellDelegate::GetDeprecatedAcceleratorImage() const {
474 return ui::ResourceBundle::GetSharedInstance().GetImageNamed( 474 return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
475 IDR_BLUETOOTH_KEYBOARD); 475 IDR_BLUETOOTH_KEYBOARD);
476 } 476 }
477 477
478 void ChromeShellDelegate::ToggleTouchpad() { 478 void ChromeShellDelegate::ToggleTouchpad() {
479 chromeos::system::InputDeviceSettings::Get()->ToggleTouchpad(); 479 chromeos::system::InputDeviceSettings::Get()->ToggleTouchpad();
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
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

Powered by Google App Engine
This is Rietveld 408576698