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

Side by Side Diff: ui/aura/window_unittest.cc

Issue 8526020: aura: Track mouse button state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « ui/aura/desktop_unittest.cc ('k') | views/widget/native_widget_aura.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) 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 "ui/aura/window.h" 5 #include "ui/aura/window.h"
6 6
7 #include <inttypes.h>
8
7 #include "base/basictypes.h" 9 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
10 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/aura/client/stacking_client.h" 13 #include "ui/aura/client/stacking_client.h"
12 #include "ui/aura/desktop.h" 14 #include "ui/aura/desktop.h"
13 #include "ui/aura/desktop_observer.h" 15 #include "ui/aura/desktop_observer.h"
14 #include "ui/aura/event.h" 16 #include "ui/aura/event.h"
15 #include "ui/aura/focus_manager.h" 17 #include "ui/aura/focus_manager.h"
16 #include "ui/aura/test/aura_test_base.h" 18 #include "ui/aura/test/aura_test_base.h"
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 int DestroyedCountAndClear() { 879 int DestroyedCountAndClear() {
878 int result = destroyed_count_; 880 int result = destroyed_count_;
879 destroyed_count_ = 0; 881 destroyed_count_ = 0;
880 return result; 882 return result;
881 } 883 }
882 884
883 // Return a string representation of the arguments passed in 885 // Return a string representation of the arguments passed in
884 // OnPropertyChanged callback. 886 // OnPropertyChanged callback.
885 std::string PropertyChangeInfoAndClear() { 887 std::string PropertyChangeInfoAndClear() {
886 std::string result( 888 std::string result(
887 base::StringPrintf("name=%s old=%ld new=%ld", 889 base::StringPrintf("name=%s old=%" PRIdPTR " new=%" PRIdPTR,
Daniel Erat 2011/11/11 00:25:57 this was breaking compilation for 32-bit. i'm not
888 property_name_.c_str(), 890 property_name_.c_str(),
889 old_property_value_, 891 old_property_value_,
890 new_property_value_)); 892 new_property_value_));
891 property_name_.clear(); 893 property_name_.clear();
892 old_property_value_ = 0; 894 old_property_value_ = 0;
893 new_property_value_ = 0; 895 new_property_value_ = 0;
894 return result; 896 return result;
895 } 897 }
896 898
897 private: 899 private:
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 1082
1081 w3->Activate(); 1083 w3->Activate();
1082 EXPECT_EQ(w2.get(), active()); 1084 EXPECT_EQ(w2.get(), active());
1083 1085
1084 w1->Activate(); 1086 w1->Activate();
1085 EXPECT_EQ(w1.get(), active()); 1087 EXPECT_EQ(w1.get(), active());
1086 } 1088 }
1087 1089
1088 } // namespace test 1090 } // namespace test
1089 } // namespace aura 1091 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/desktop_unittest.cc ('k') | views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698