summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:32:44 +0000
committerkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:32:44 +0000
commita5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6 (patch)
treec1f5ac671eee74378c701406d4800864a8a3d69d /ash/test
parent7c0a01ad2b00207514ab5b0a2573a037241f685c (diff)
downloadchromium_src-a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6.zip
chromium_src-a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6.tar.gz
chromium_src-a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6.tar.bz2
Remove Ctrl+M for the Chrome OS Files app
BUG=152769 Review URL: https://chromiumcodereview.appspot.com/11530009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/test_shell_delegate.cc2
-rw-r--r--ash/test/test_shell_delegate.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 4af4eb3..066a14b 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -80,7 +80,7 @@ void TestShellDelegate::ToggleMaximized() {
ash::wm::ToggleMaximizedWindow(window);
}
-void TestShellDelegate::OpenFileManager(bool as_dialog) {
+void TestShellDelegate::OpenFileManager() {
}
void TestShellDelegate::OpenCrosh() {
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 36fe97b..c35d116 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -32,7 +32,7 @@ class TestShellDelegate : public ShellDelegate {
virtual void NewTab() OVERRIDE;
virtual void NewWindow(bool incognito) OVERRIDE;
virtual void ToggleMaximized() OVERRIDE;
- virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+ virtual void OpenFileManager() OVERRIDE;
virtual void OpenCrosh() OVERRIDE;
virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
virtual void RestoreTab() OVERRIDE;