summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 23:32:14 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 23:32:14 +0000
commit480f17f54cc69b41ebff81e6fdc4b297f7beb3d6 (patch)
tree76efe66e9dd00b0b75f089df076d0a29221185f2 /ash/test
parentd0eef0265c6112f037e600652442ab43ec938d4d (diff)
downloadchromium_src-480f17f54cc69b41ebff81e6fdc4b297f7beb3d6.zip
chromium_src-480f17f54cc69b41ebff81e6fdc4b297f7beb3d6.tar.gz
chromium_src-480f17f54cc69b41ebff81e6fdc4b297f7beb3d6.tar.bz2
Make the shortcut of opening content browser global.
BUG=124232 TEST=Manual Review URL: https://chromiumcodereview.appspot.com/10535140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142021 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 3a47f5f..356943a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -51,7 +51,7 @@ void TestShellDelegate::NewTab() {
void TestShellDelegate::NewWindow(bool incognito) {
}
-void TestShellDelegate::OpenFileManager() {
+void TestShellDelegate::OpenFileManager(bool as_dialog) {
}
void TestShellDelegate::OpenCrosh() {
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9091e4e..15e5bca 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -26,7 +26,7 @@ class TestShellDelegate : public ShellDelegate {
virtual void Exit() OVERRIDE;
virtual void NewTab() OVERRIDE;
virtual void NewWindow(bool incognito) OVERRIDE;
- virtual void OpenFileManager() OVERRIDE;
+ virtual void OpenFileManager(bool as_dialog) OVERRIDE;
virtual void OpenCrosh() OVERRIDE;
virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
virtual void RestoreTab() OVERRIDE;