diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 19:31:54 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 19:31:54 +0000 |
| commit | 88e31385ab21d4c197e81961e1dd9e16b1793bdb (patch) | |
| tree | b0536e8753a6b60c2ea01d8e601c585677eec7ca /ui/aura_shell/test/test_shell_delegate.cc | |
| parent | cc12785ecca7f7f346bde96b66a6eb3b4110cc08 (diff) | |
| download | chromium_src-88e31385ab21d4c197e81961e1dd9e16b1793bdb.zip chromium_src-88e31385ab21d4c197e81961e1dd9e16b1793bdb.tar.gz chromium_src-88e31385ab21d4c197e81961e1dd9e16b1793bdb.tar.bz2 | |
Reverting issues 8873036 and issues 8933010
http://codereview.chromium.org/8933010/ caused a regression in interactive_ui_tests on Linux+Aura+ChromeOS
http://codereview.chromium.org/8873036/
was rebased on the above and had to be reverted
TBR=sky@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8916010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/test/test_shell_delegate.cc')
| -rw-r--r-- | ui/aura_shell/test/test_shell_delegate.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ui/aura_shell/test/test_shell_delegate.cc b/ui/aura_shell/test/test_shell_delegate.cc index 98057f9..42414b7 100644 --- a/ui/aura_shell/test/test_shell_delegate.cc +++ b/ui/aura_shell/test/test_shell_delegate.cc @@ -4,8 +4,6 @@ #include "ui/aura_shell/test/test_shell_delegate.h" -#include "grit/ui_resources.h" - namespace aura_shell { namespace test { @@ -34,9 +32,5 @@ bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) { return true; } -int TestShellDelegate::GetResourceIDForNewBrowserWindow() { - return IDR_AURA_LAUNCHER_ICON_CHROME; -} - } // namespace test } // namespace aura_shell |