diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
7 files changed, 17 insertions, 16 deletions
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm index 2a4c1e9..aa4ac44 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm @@ -64,7 +64,8 @@ NSAppleEventDescriptor* ValueToAppleEventDescriptor(const base::Value* value) { descriptor = [NSAppleEventDescriptor recordDescriptor]; NSAppleEventDescriptor* userRecord = [NSAppleEventDescriptor listDescriptor]; - for (DictionaryValue::Iterator iter(*dictionary_value); !iter.IsAtEnd(); + for (base::DictionaryValue::Iterator iter(*dictionary_value); + !iter.IsAtEnd(); iter.Advance()) { [userRecord insertDescriptor:[NSAppleEventDescriptor descriptorWithString:base::SysUTF8ToNSString(iter.key())] diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index 01bb5e6..2083420 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -123,7 +123,7 @@ const CGFloat kLocBarBottomInset = 1; DictionaryPrefUpdate update( prefs, chrome::GetWindowPlacementKey(browser_.get()).c_str()); - DictionaryValue* windowPreferences = update.Get(); + base::DictionaryValue* windowPreferences = update.Get(); windowPreferences->SetInteger("left", bounds.x()); windowPreferences->SetInteger("top", bounds.y()); windowPreferences->SetInteger("right", bounds.right()); diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index d4485e2..ce5c71c 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -99,7 +99,7 @@ TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) { ASSERT_TRUE(prefs != NULL); // Check to make sure there is no existing pref for window placement. - const DictionaryValue* browser_window_placement = + const base::DictionaryValue* browser_window_placement = prefs->GetDictionary(prefs::kBrowserWindowPlacement); ASSERT_TRUE(browser_window_placement); EXPECT_TRUE(browser_window_placement->empty()); diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm index 3a869aa..a6cd778 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm @@ -36,7 +36,7 @@ scoped_refptr<extensions::Extension> LoadInstallPromptExtension( std::string error; JSONFileValueSerializer serializer(path); - scoped_ptr<DictionaryValue> value(static_cast<DictionaryValue*>( + scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>( serializer.Deserialize(NULL, &error))); if (!value.get()) { LOG(ERROR) << error; diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 1ae61bc..6298663 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -86,20 +86,20 @@ class ExtensionInstalledBubbleControllerTest : public CocoaProfileTest { PathService::Get(chrome::DIR_TEST_DATA, &path); path = path.AppendASCII("extensions").AppendASCII("dummy"); - DictionaryValue extension_input_value; + base::DictionaryValue extension_input_value; extension_input_value.SetString(keys::kVersion, "1.0.0.0"); if (type == extension_installed_bubble::kPageAction) { extension_input_value.SetString(keys::kName, "page action extension"); - DictionaryValue* action = new DictionaryValue; + base::DictionaryValue* action = new base::DictionaryValue; action->SetString(keys::kPageActionId, "ExtensionActionId"); action->SetString(keys::kPageActionDefaultTitle, "ExtensionActionTitle"); action->SetString(keys::kPageActionDefaultIcon, "image1.png"); - ListValue* action_list = new ListValue; + base::ListValue* action_list = new base::ListValue; action_list->Append(action); extension_input_value.Set(keys::kPageActions, action_list); } else if (type == extension_installed_bubble::kBrowserAction) { extension_input_value.SetString(keys::kName, "browser action extension"); - DictionaryValue* browser_action = new DictionaryValue; + base::DictionaryValue* browser_action = new base::DictionaryValue; // An empty dictionary is enough to create a Browser Action. extension_input_value.Set(keys::kBrowserAction, browser_action); } else if (type == extension_installed_bubble::kApp) { diff --git a/chrome/browser/ui/cocoa/window_size_autosaver.mm b/chrome/browser/ui/cocoa/window_size_autosaver.mm index 63eb986..c5716f8 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver.mm @@ -54,7 +54,7 @@ const int kMinWindowHeight = 17; - (void)save:(NSNotification*)notification { DictionaryPrefUpdate update(prefService_, path_); - DictionaryValue* windowPrefs = update.Get(); + base::DictionaryValue* windowPrefs = update.Get(); NSRect frame = [window_ frame]; if ([window_ styleMask] & NSResizableWindowMask) { // Save the origin of the window. @@ -74,7 +74,7 @@ const int kMinWindowHeight = 17; - (void)restore { // Get the positioning information. - const DictionaryValue* windowPrefs = prefService_->GetDictionary(path_); + const base::DictionaryValue* windowPrefs = prefService_->GetDictionary(path_); if ([window_ styleMask] & NSResizableWindowMask) { int x1, x2, y1, y2; if (!windowPrefs->GetInteger("left", &x1) || @@ -86,7 +86,7 @@ const int kMinWindowHeight = 17; if (x2 - x1 < kMinWindowWidth || y2 - y1 < kMinWindowHeight) { // Windows should never be very small. DictionaryPrefUpdate update(prefService_, path_); - DictionaryValue* mutableWindowPrefs = update.Get(); + base::DictionaryValue* mutableWindowPrefs = update.Get(); mutableWindowPrefs->Remove("left", NULL); mutableWindowPrefs->Remove("right", NULL); mutableWindowPrefs->Remove("top", NULL); diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm index 9a86034..febbdd5 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm @@ -50,7 +50,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesPos) { ASSERT_TRUE(pref != NULL); // Check to make sure there is no existing pref for window placement. - const DictionaryValue* placement = pref->GetDictionary(path_); + const base::DictionaryValue* placement = pref->GetDictionary(path_); ASSERT_TRUE(placement); EXPECT_TRUE(placement->empty()); @@ -101,7 +101,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesPos) { // ...and it should be in the profile, too. EXPECT_TRUE(pref->GetDictionary(path_) != NULL); int x, y; - const DictionaryValue* windowPref = pref->GetDictionary(path_); + const base::DictionaryValue* windowPref = pref->GetDictionary(path_); EXPECT_FALSE(windowPref->GetInteger("left", &x)); EXPECT_FALSE(windowPref->GetInteger("right", &x)); EXPECT_FALSE(windowPref->GetInteger("top", &x)); @@ -117,7 +117,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesRect) { ASSERT_TRUE(pref != NULL); // Check to make sure there is no existing pref for window placement. - const DictionaryValue* placement = pref->GetDictionary(path_); + const base::DictionaryValue* placement = pref->GetDictionary(path_); ASSERT_TRUE(placement); EXPECT_TRUE(placement->empty()); @@ -160,7 +160,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesRect) { // ...and it should be in the profile, too. EXPECT_TRUE(pref->GetDictionary(path_) != NULL); int x1, y1, x2, y2; - const DictionaryValue* windowPref = pref->GetDictionary(path_); + const base::DictionaryValue* windowPref = pref->GetDictionary(path_); EXPECT_FALSE(windowPref->GetInteger("x", &x1)); EXPECT_FALSE(windowPref->GetInteger("y", &x1)); ASSERT_TRUE(windowPref->GetInteger("left", &x1)); @@ -179,7 +179,7 @@ TEST_F(WindowSizeAutosaverTest, DoesNotRestoreButClearsEmptyRect) { ASSERT_TRUE(pref != NULL); DictionaryPrefUpdate update(pref, path_); - DictionaryValue* windowPref = update.Get(); + base::DictionaryValue* windowPref = update.Get(); windowPref->SetInteger("left", 50); windowPref->SetInteger("right", 50); windowPref->SetInteger("top", 60); |