Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/views/ash/launcher/browser_launcher_item_controller. h" 5 #include "chrome/browser/ui/views/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/tab_contents/tab_contents_wrapper.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h" 14 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
15 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" 15 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.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/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/aura_constants.h" 21 #include "ui/aura/client/aura_constants.h"
22 #include "ui/aura/client/activation_delegate.h" 22 #include "ui/aura/client/activation_delegate.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 28
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status); 382 EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);
383 383
384 // App window should go to attention state. 384 // App window should go to attention state.
385 app_state.window.SetProperty(aura::client::kDrawAttentionKey, true); 385 app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
386 EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status); 386 EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);
387 387
388 // Activating app window should clear attention state. 388 // Activating app window should clear attention state.
389 activation_client_->ActivateWindow(&app_state.window); 389 activation_client_->ActivateWindow(&app_state.window);
390 EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status); 390 EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
391 } 391 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698