OLD | NEW |
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/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/global_error.h" | 9 #include "chrome/browser/ui/global_error/global_error.h" |
10 #include "chrome/browser/ui/global_error/global_error_service.h" | 10 #include "chrome/browser/ui/global_error/global_error_service.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 return 0; | 39 return 0; |
40 } | 40 } |
41 virtual string16 GetBubbleViewTitle() OVERRIDE { | 41 virtual string16 GetBubbleViewTitle() OVERRIDE { |
42 ADD_FAILURE(); | 42 ADD_FAILURE(); |
43 return string16(); | 43 return string16(); |
44 } | 44 } |
45 virtual string16 GetBubbleViewMessage() OVERRIDE { | 45 virtual string16 GetBubbleViewMessage() OVERRIDE { |
46 ADD_FAILURE(); | 46 ADD_FAILURE(); |
47 return string16(); | 47 return string16(); |
48 } | 48 } |
| 49 virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE { |
| 50 ADD_FAILURE(); |
| 51 return std::vector<string16>(); |
| 52 } |
49 virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE { | 53 virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE { |
50 ADD_FAILURE(); | 54 ADD_FAILURE(); |
51 return string16(); | 55 return string16(); |
52 } | 56 } |
53 virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE { | 57 virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE { |
54 ADD_FAILURE(); | 58 ADD_FAILURE(); |
55 return string16(); | 59 return string16(); |
56 } | 60 } |
57 virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE { | 61 virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE { |
58 ADD_FAILURE(); | 62 ADD_FAILURE(); |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 | 197 |
194 class EncodingMenuModelTest : public BrowserWithTestWindowTest, | 198 class EncodingMenuModelTest : public BrowserWithTestWindowTest, |
195 public MenuModelTest { | 199 public MenuModelTest { |
196 }; | 200 }; |
197 | 201 |
198 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { | 202 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { |
199 EncodingMenuModel model(browser()); | 203 EncodingMenuModel model(browser()); |
200 ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents()); | 204 ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents()); |
201 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); | 205 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); |
202 } | 206 } |
OLD | NEW |