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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 path = path.AppendASCII("extensions").AppendASCII("dummy"); | 87 path = path.AppendASCII("extensions").AppendASCII("dummy"); |
88 | 88 |
89 base::DictionaryValue extension_input_value; | 89 base::DictionaryValue extension_input_value; |
90 extension_input_value.SetString(keys::kVersion, "1.0.0.0"); | 90 extension_input_value.SetString(keys::kVersion, "1.0.0.0"); |
91 if (type == extension_installed_bubble::kPageAction) { | 91 if (type == extension_installed_bubble::kPageAction) { |
92 extension_input_value.SetString(keys::kName, "page action extension"); | 92 extension_input_value.SetString(keys::kName, "page action extension"); |
93 base::DictionaryValue* action = new base::DictionaryValue; | 93 base::DictionaryValue* action = new base::DictionaryValue; |
94 action->SetString(keys::kPageActionId, "ExtensionActionId"); | 94 action->SetString(keys::kPageActionId, "ExtensionActionId"); |
95 action->SetString(keys::kPageActionDefaultTitle, "ExtensionActionTitle"); | 95 action->SetString(keys::kPageActionDefaultTitle, "ExtensionActionTitle"); |
96 action->SetString(keys::kPageActionDefaultIcon, "image1.png"); | 96 action->SetString(keys::kPageActionDefaultIcon, "image1.png"); |
97 base::ListValue* action_list = new base::ListValue; | 97 extension_input_value.Set(keys::kPageAction, action); |
98 action_list->Append(action); | |
99 extension_input_value.Set(keys::kPageActions, action_list); | |
100 } else if (type == extension_installed_bubble::kBrowserAction) { | 98 } else if (type == extension_installed_bubble::kBrowserAction) { |
101 extension_input_value.SetString(keys::kName, "browser action extension"); | 99 extension_input_value.SetString(keys::kName, "browser action extension"); |
102 base::DictionaryValue* browser_action = new base::DictionaryValue; | 100 base::DictionaryValue* browser_action = new base::DictionaryValue; |
103 // An empty dictionary is enough to create a Browser Action. | 101 // An empty dictionary is enough to create a Browser Action. |
104 extension_input_value.Set(keys::kBrowserAction, browser_action); | 102 extension_input_value.Set(keys::kBrowserAction, browser_action); |
105 } else if (type == extension_installed_bubble::kApp) { | 103 } else if (type == extension_installed_bubble::kApp) { |
106 extension_input_value.SetString(keys::kName, "test app"); | 104 extension_input_value.SetString(keys::kName, "test app"); |
107 extension_input_value.SetString(keys::kLaunchWebURL, | 105 extension_input_value.SetString(keys::kLaunchWebURL, |
108 "http://www.example.com"); | 106 "http://www.example.com"); |
109 } | 107 } |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 int minHeight = extension_installed_bubble::kIconSize + | 302 int minHeight = extension_installed_bubble::kIconSize + |
305 (2 * extension_installed_bubble::kOuterVerticalMargin); | 303 (2 * extension_installed_bubble::kOuterVerticalMargin); |
306 EXPECT_GT(height, minHeight); | 304 EXPECT_GT(height, minHeight); |
307 | 305 |
308 // Make sure the "show me" link is visible. | 306 // Make sure the "show me" link is visible. |
309 EXPECT_FALSE([[controller appInstalledShortcutLink] isHidden]); | 307 EXPECT_FALSE([[controller appInstalledShortcutLink] isHidden]); |
310 | 308 |
311 [controller close]; | 309 [controller close]; |
312 } | 310 } |
313 | 311 |
OLD | NEW |