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

Side by Side Diff: ash/launcher/launcher_view_unittest.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/launcher/overflow_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/launcher/launcher_view.h" 5 #include "ash/launcher/launcher_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/launcher/launcher.h" 10 #include "ash/launcher/launcher.h"
11 #include "ash/launcher/launcher_button.h" 11 #include "ash/launcher/launcher_button.h"
12 #include "ash/launcher/launcher_icon_observer.h" 12 #include "ash/launcher/launcher_icon_observer.h"
13 #include "ash/launcher/launcher_model.h" 13 #include "ash/launcher/launcher_model.h"
14 #include "ash/launcher/launcher_tooltip_manager.h" 14 #include "ash/launcher/launcher_tooltip_manager.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
17 #include "ash/test/launcher_view_test_api.h" 17 #include "ash/test/launcher_view_test_api.h"
18 #include "ash/test/test_launcher_delegate.h" 18 #include "ash/test/test_launcher_delegate.h"
19 #include "base/basictypes.h" 19 #include "base/basictypes.h"
20 #include "base/compiler_specific.h" 20 #include "base/compiler_specific.h"
21 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
22 #include "grit/ui_resources.h" 22 #include "grit/ash_resources.h"
23 #include "ui/aura/test/aura_test_base.h" 23 #include "ui/aura/test/aura_test_base.h"
24 #include "ui/aura/window.h" 24 #include "ui/aura/window.h"
25 #include "ui/base/events/event.h" 25 #include "ui/base/events/event.h"
26 #include "ui/base/events/event_constants.h" 26 #include "ui/base/events/event_constants.h"
27 #include "ui/compositor/layer.h" 27 #include "ui/compositor/layer.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 #include "ui/views/widget/widget_delegate.h" 29 #include "ui/views/widget/widget_delegate.h"
30 30
31 namespace { 31 namespace {
32 const int kExpectedAppIndex = 2; 32 const int kExpectedAppIndex = 2;
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 const int app_list_button_index = test_api_->GetButtonCount() - 1; 727 const int app_list_button_index = test_api_->GetButtonCount() - 1;
728 const gfx::Rect& app_list_ideal_bounds = 728 const gfx::Rect& app_list_ideal_bounds =
729 test_api_->GetIdealBoundsByIndex(app_list_button_index); 729 test_api_->GetIdealBoundsByIndex(app_list_button_index);
730 const gfx::Rect& app_list_bounds = 730 const gfx::Rect& app_list_bounds =
731 test_api_->GetBoundsByIndex(app_list_button_index); 731 test_api_->GetBoundsByIndex(app_list_button_index);
732 EXPECT_EQ(app_list_bounds, app_list_ideal_bounds); 732 EXPECT_EQ(app_list_bounds, app_list_ideal_bounds);
733 } 733 }
734 734
735 } // namespace test 735 } // namespace test
736 } // namespace ash 736 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/launcher/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698