| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/launcher/launcher_model.h" | 10 #include "ash/launcher/launcher_model.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 13 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 13 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 15 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h" | 15 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h" |
| 16 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 16 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 17 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
| 18 #include "content/public/test/test_browser_thread.h" | 18 #include "content/public/test/test_browser_thread.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 20 #include "third_party/skia/include/core/SkBitmap.h" | 20 #include "third_party/skia/include/core/SkBitmap.h" |
| 21 #include "ui/aura/client/activation_delegate.h" | 21 #include "ui/aura/client/activation_delegate.h" |
| 22 #include "ui/aura/client/aura_constants.h" | 22 #include "ui/aura/client/aura_constants.h" |
| 23 #include "ui/aura/root_window.h" | 23 #include "ui/aura/root_window.h" |
| 24 #include "ui/aura/test/test_activation_client.h" | 24 #include "ui/aura/test/test_activation_client.h" |
| 25 #include "ui/aura/test/test_window_delegate.h" | 25 #include "ui/aura/test/test_window_delegate.h" |
| 26 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
| 27 #include "ui/aura/window_delegate.h" | 27 #include "ui/aura/window_delegate.h" |
| 28 #include "ui/base/event.h" | 28 #include "ui/base/events/event.h" |
| 29 | 29 |
| 30 // TODO(avi): Kill this when TabContents goes away. | 30 // TODO(avi): Kill this when TabContents goes away. |
| 31 class BrowserLauncherItemControllerContentsCreator { | 31 class BrowserLauncherItemControllerContentsCreator { |
| 32 public: | 32 public: |
| 33 static TabContents* CreateTabContents(content::WebContents* contents) { | 33 static TabContents* CreateTabContents(content::WebContents* contents) { |
| 34 return TabContents::Factory::CreateTabContents(contents); | 34 return TabContents::Factory::CreateTabContents(contents); |
| 35 } | 35 } |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status); | 430 EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status); |
| 431 | 431 |
| 432 // App window should go to attention state. | 432 // App window should go to attention state. |
| 433 app_state.window.SetProperty(aura::client::kDrawAttentionKey, true); | 433 app_state.window.SetProperty(aura::client::kDrawAttentionKey, true); |
| 434 EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status); | 434 EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status); |
| 435 | 435 |
| 436 // Activating app window should clear attention state. | 436 // Activating app window should clear attention state. |
| 437 activation_client_->ActivateWindow(&app_state.window); | 437 activation_client_->ActivateWindow(&app_state.window); |
| 438 EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status); | 438 EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status); |
| 439 } | 439 } |
| OLD | NEW |