OLD | NEW |
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 "chrome/browser/ui/toolbar/wrench_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/global_error.h" | 9 #include "chrome/browser/ui/global_error.h" |
10 #include "chrome/browser/ui/global_error_service.h" | 10 #include "chrome/browser/ui/global_error_service.h" |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 model.ActivatedAt(index2); | 187 model.ActivatedAt(index2); |
188 EXPECT_EQ(1, error1->execute_count()); | 188 EXPECT_EQ(1, error1->execute_count()); |
189 } | 189 } |
190 | 190 |
191 class EncodingMenuModelTest : public BrowserWithTestWindowTest, | 191 class EncodingMenuModelTest : public BrowserWithTestWindowTest, |
192 public MenuModelTest { | 192 public MenuModelTest { |
193 }; | 193 }; |
194 | 194 |
195 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { | 195 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { |
196 EncodingMenuModel model(browser()); | 196 EncodingMenuModel model(browser()); |
197 ASSERT_EQ(NULL, browser()->GetSelectedTabContents()); | 197 ASSERT_EQ(NULL, browser()->GetSelectedWebContents()); |
198 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); | 198 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); |
199 } | 199 } |
OLD | NEW |