summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 21:11:52 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 21:11:52 +0000
commit1e9b90157eb384c807a5a34f2662fabdf716b4df (patch)
tree2b3c4a53e14942370a1030a75a0def57eb9268d5 /chrome/browser/cocoa
parent8516d45ac31e1d9051c45f6df1007c8c477c35ec (diff)
downloadchromium_src-1e9b90157eb384c807a5a34f2662fabdf716b4df.zip
chromium_src-1e9b90157eb384c807a5a34f2662fabdf716b4df.tar.gz
chromium_src-1e9b90157eb384c807a5a34f2662fabdf716b4df.tar.bz2
Add storage for static member vars.
This way, the code is standards-compliant _and_ makes clang happy. Review URL: http://codereview.chromium.org/2870023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm3
-rw-r--r--chrome/browser/cocoa/sad_tab_controller_unittest.mm3
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm
index 6beecde..e392ed4 100644
--- a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm
@@ -60,6 +60,9 @@ class BookmarkBubbleControllerTest : public CocoaTest {
}
};
+// static
+int BookmarkBubbleControllerTest::edits_;
+
// Confirm basics about the bubble window (e.g. that it is inside the
// parent window)
TEST_F(BookmarkBubbleControllerTest, TestBubbleWindow) {
diff --git a/chrome/browser/cocoa/sad_tab_controller_unittest.mm b/chrome/browser/cocoa/sad_tab_controller_unittest.mm
index b3c959f..bce97a6 100644
--- a/chrome/browser/cocoa/sad_tab_controller_unittest.mm
+++ b/chrome/browser/cocoa/sad_tab_controller_unittest.mm
@@ -68,6 +68,9 @@ class SadTabControllerTest : public RenderViewHostTestHarness {
CocoaTestHelperWindow* test_window_;
};
+// static
+bool SadTabControllerTest::link_clicked_;
+
TEST_F(SadTabControllerTest, WithTabContents) {
scoped_nsobject<SadTabController> controller(CreateController());
EXPECT_TRUE(controller);