OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "grit/ui_resources.h" |
10 #include "ui/aura/root_window.h" | 11 #include "ui/aura/root_window.h" |
11 #include "ui/aura_shell/examples/toplevel_window.h" | 12 #include "ui/aura_shell/examples/toplevel_window.h" |
12 #include "ui/aura_shell/launcher/launcher_types.h" | 13 #include "ui/aura_shell/launcher/launcher_types.h" |
13 #include "ui/aura_shell/shell.h" | 14 #include "ui/aura_shell/shell.h" |
14 #include "ui/aura_shell/shell_delegate.h" | 15 #include "ui/aura_shell/shell_delegate.h" |
15 #include "ui/aura_shell/shell_factory.h" | 16 #include "ui/aura_shell/shell_factory.h" |
16 #include "ui/aura_shell/window_util.h" | 17 #include "ui/aura_shell/window_util.h" |
17 #include "ui/base/resource/resource_bundle.h" | 18 #include "ui/base/resource/resource_bundle.h" |
18 #include "ui/base/ui_base_paths.h" | 19 #include "ui/base/ui_base_paths.h" |
19 #include "ui/gfx/canvas.h" | 20 #include "ui/gfx/canvas.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 item->tab_images[i].image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); | 86 item->tab_images[i].image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); |
86 item->tab_images[i].image.allocPixels(); | 87 item->tab_images[i].image.allocPixels(); |
87 item->tab_images[i].image.eraseARGB(255, | 88 item->tab_images[i].image.eraseARGB(255, |
88 i == 0 ? 255 : 0, | 89 i == 0 ? 255 : 0, |
89 i == 1 ? 255 : 0, | 90 i == 1 ? 255 : 0, |
90 i == 2 ? 255 : 0); | 91 i == 2 ? 255 : 0); |
91 } | 92 } |
92 image_count = (image_count + 1) % 3; | 93 image_count = (image_count + 1) % 3; |
93 return true; // Makes the entry show up in the launcher. | 94 return true; // Makes the entry show up in the launcher. |
94 } | 95 } |
| 96 |
| 97 virtual int GetResourceIDForNewBrowserWindow() OVERRIDE { |
| 98 return IDR_AURA_LAUNCHER_ICON_CHROME; |
| 99 } |
95 }; | 100 }; |
96 | 101 |
97 } // namespace | 102 } // namespace |
98 | 103 |
99 namespace aura_shell { | 104 namespace aura_shell { |
100 namespace examples { | 105 namespace examples { |
101 | 106 |
102 void InitWindowTypeLauncher(); | 107 void InitWindowTypeLauncher(); |
103 | 108 |
104 } // namespace examples | 109 } // namespace examples |
(...skipping 20 matching lines...) Expand all Loading... |
125 aura::RootWindow::GetInstance()->Run(); | 130 aura::RootWindow::GetInstance()->Run(); |
126 | 131 |
127 aura_shell::Shell::DeleteInstance(); | 132 aura_shell::Shell::DeleteInstance(); |
128 | 133 |
129 aura::RootWindow::DeleteInstance(); | 134 aura::RootWindow::DeleteInstance(); |
130 | 135 |
131 ui::CompositorTestSupport::Terminate(); | 136 ui::CompositorTestSupport::Terminate(); |
132 | 137 |
133 return 0; | 138 return 0; |
134 } | 139 } |
OLD | NEW |