| 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 "ui/aura/desktop.h" | 10 #include "ui/aura/desktop.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 static int image_count = 0; | 44 static int image_count = 0; |
| 45 item->tab_images.resize(image_count + 1); | 45 item->tab_images.resize(image_count + 1); |
| 46 for (int i = 0; i < image_count + 1; ++i) { | 46 for (int i = 0; i < image_count + 1; ++i) { |
| 47 item->tab_images[i].image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); | 47 item->tab_images[i].image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); |
| 48 item->tab_images[i].image.allocPixels(); | 48 item->tab_images[i].image.allocPixels(); |
| 49 item->tab_images[i].image.eraseARGB(255, | 49 item->tab_images[i].image.eraseARGB(255, |
| 50 i == 0 ? 255 : 0, | 50 i == 0 ? 255 : 0, |
| 51 i == 1 ? 255 : 0, | 51 i == 1 ? 255 : 0, |
| 52 i == 2 ? 255 : 0); | 52 i == 2 ? 255 : 0); |
| 53 } | 53 } |
| 54 image_count = (image_count + 1) % 2; | 54 image_count = (image_count + 1) % 3; |
| 55 return true; // Makes the entry show up in the launcher. | 55 return true; // Makes the entry show up in the launcher. |
| 56 } | 56 } |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namesapce | 59 } // namesapce |
| 60 | 60 |
| 61 int main(int argc, char** argv) { | 61 int main(int argc, char** argv) { |
| 62 CommandLine::Init(argc, argv); | 62 CommandLine::Init(argc, argv); |
| 63 | 63 |
| 64 // The exit manager is in charge of calling the dtors of singleton objects. | 64 // The exit manager is in charge of calling the dtors of singleton objects. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 78 | 78 |
| 79 aura::Desktop::GetInstance()->Run(); | 79 aura::Desktop::GetInstance()->Run(); |
| 80 | 80 |
| 81 delete aura::Desktop::GetInstance(); | 81 delete aura::Desktop::GetInstance(); |
| 82 | 82 |
| 83 ui::CompositorTestSupport::Terminate(); | 83 ui::CompositorTestSupport::Terminate(); |
| 84 | 84 |
| 85 return 0; | 85 return 0; |
| 86 } | 86 } |
| 87 | 87 |
| OLD | NEW |