From dbb9aa45617ebf4b521f066b3cd69a06b5a627d4 Mon Sep 17 00:00:00 2001
From: "avi@chromium.org"
<avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 23 Dec 2013 20:08:21 +0000
Subject: Update some uses of Value in chrome/browser to use the base::
namespace.
BUG=88666
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/113013003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242399 0039d316-1c4b-4281-b951-d872f2087c98
---
.../app_list/extension_app_model_builder_unittest.cc | 2 +-
.../ui/app_list/search/common/webservice_cache.cc | 2 +-
.../ui/app_list/search/people/people_provider.cc | 2 +-
chrome/browser/ui/app_list/search/people/person.cc | 2 +-
.../ui/app_list/search/webstore/webstore_provider.cc | 2 +-
.../ui/ash/launcher/chrome_launcher_controller.cc | 2 +-
.../launcher/chrome_launcher_controller_unittest.cc | 10 +++++-----
.../ui/autofill/autofill_dialog_controller_unittest.cc | 8 ++++----
.../browser/ui/cocoa/applescript/apple_event_util.mm | 3 ++-
.../ui/cocoa/browser_window_controller_private.mm | 2 +-
.../ui/cocoa/browser_window_controller_unittest.mm | 2 +-
.../extensions/extension_install_prompt_test_utils.mm | 2 +-
.../extension_installed_bubble_controller_unittest.mm | 8 ++++----
chrome/browser/ui/cocoa/window_size_autosaver.mm | 6 +++---
.../browser/ui/cocoa/window_size_autosaver_unittest.mm | 10 +++++-----
.../content_settings/content_setting_bubble_model.cc | 2 +-
chrome/browser/ui/gtk/browser_window_gtk.cc | 2 +-
chrome/browser/ui/gtk/task_manager_gtk.cc | 4 ++--
chrome/browser/ui/panels/base_panel_browser_test.cc | 4 ++--
chrome/browser/ui/panels/base_panel_browser_test.h | 2 +-
chrome/browser/ui/panels/panel.cc | 6 +++---
chrome/browser/ui/panels/panel_browsertest.cc | 2 +-
chrome/browser/ui/panels/stacked_panel_browsertest.cc | 2 +-
chrome/browser/ui/pdf/pdf_unsupported_feature.cc | 2 +-
chrome/browser/ui/sync/one_click_signin_helper.cc | 2 +-
.../profile_signin_confirmation_helper_unittest.cc | 2 +-
chrome/browser/ui/tabs/pinned_tab_codec.cc | 18 +++++++++---------
chrome/browser/ui/tabs/tab_strip_model_unittest.cc | 2 +-
chrome/browser/ui/views/about_ipc_dialog.cc | 2 +-
chrome/browser/ui/views/chrome_views_delegate.cc | 5 +++--
30 files changed, 61 insertions(+), 59 deletions(-)
(limited to 'chrome/browser/ui')
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
index 597f684..0a63a65 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
@@ -47,7 +47,7 @@ scoped_refptr<extensions::Extension> MakeApp(const std::string& name,
const std::string& url,
const std::string& id) {
std::string err;
- DictionaryValue value;
+ base::DictionaryValue value;
value.SetString("name", name);
value.SetString("version", version);
value.SetString("app.launch.web_url", url);
diff --git a/chrome/browser/ui/app_list/search/common/webservice_cache.cc b/chrome/browser/ui/app_list/search/common/webservice_cache.cc
index ff0e15f..7835301 100644
--- a/chrome/browser/ui/app_list/search/common/webservice_cache.cc
+++ b/chrome/browser/ui/app_list/search/common/webservice_cache.cc
@@ -80,7 +80,7 @@ void WebserviceCache::OnCacheLoaded(scoped_ptr<base::DictionaryValue>) {
return;
std::vector<std::string> cleanup_keys;
- for (DictionaryValue::Iterator it(*data_store_->cached_dict());
+ for (base::DictionaryValue::Iterator it(*data_store_->cached_dict());
!it.IsAtEnd();
it.Advance()) {
const base::DictionaryValue* payload_dict;
diff --git a/chrome/browser/ui/app_list/search/people/people_provider.cc b/chrome/browser/ui/app_list/search/people/people_provider.cc
index 545b9e5..b5a4793 100644
--- a/chrome/browser/ui/app_list/search/people/people_provider.cc
+++ b/chrome/browser/ui/app_list/search/people/people_provider.cc
@@ -162,7 +162,7 @@ void PeopleProvider::ProcessPeopleSearchResults(
}
ClearResults();
- for (ListValue::const_iterator it = item_list->begin();
+ for (base::ListValue::const_iterator it = item_list->begin();
it != item_list->end();
++it) {
const base::DictionaryValue* dict;
diff --git a/chrome/browser/ui/app_list/search/people/person.cc b/chrome/browser/ui/app_list/search/people/person.cc
index eb19164..3e2a7de 100644
--- a/chrome/browser/ui/app_list/search/people/person.cc
+++ b/chrome/browser/ui/app_list/search/people/person.cc
@@ -43,7 +43,7 @@ std::string GetTargetValue(const base::DictionaryValue& dict,
if (!dict.GetList(list_key, &list) || !list)
return std::string();
- ListValue::const_iterator it = list->begin();
+ base::ListValue::const_iterator it = list->begin();
if (it == list->end())
return std::string();
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
index b22b397..88a7008 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
@@ -114,7 +114,7 @@ void WebstoreProvider::ProcessWebstoreSearchResults(
}
bool first_result = true;
- for (ListValue::const_iterator it = result_list->begin();
+ for (base::ListValue::const_iterator it = result_list->begin();
it != result_list->end();
++it) {
const base::DictionaryValue* dict;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 1e9d34a..42554cd 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -1906,7 +1906,7 @@ ChromeLauncherController::GetListOfPinnedAppsAndBrowser() {
pinned_apps.push_back(extension_misc::kChromeAppId);
chrome_icon_added = true;
}
- const DictionaryValue* app = NULL;
+ const base::DictionaryValue* app = NULL;
std::string app_id;
if (pinned_apps_pref->GetDictionary(index, &app) &&
app->GetString(ash::kPinnedAppsPrefAppIDPath, &app_id) &&
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 78d7b55..9582598d 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -284,7 +284,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
new ash::ShelfItemDelegateManager(model_.get());
}
- DictionaryValue manifest;
+ base::DictionaryValue manifest;
manifest.SetString(extensions::manifest_keys::kName,
"launcher controller test extension");
manifest.SetString(extensions::manifest_keys::kVersion, "1");
@@ -309,7 +309,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
&error);
// Fake gmail extension.
- DictionaryValue manifest_gmail;
+ base::DictionaryValue manifest_gmail;
manifest_gmail.SetString(extensions::manifest_keys::kName,
"Gmail launcher controller test extension");
manifest_gmail.SetString(extensions::manifest_keys::kVersion, "1");
@@ -317,8 +317,8 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
"for testing pinned Gmail");
manifest_gmail.SetString(extensions::manifest_keys::kLaunchWebURL,
kGmailLaunchURL);
- ListValue* list = new ListValue();
- list->Append(Value::CreateStringValue("*://mail.google.com/mail/ca"));
+ base::ListValue* list = new base::ListValue();
+ list->Append(base::Value::CreateStringValue("*://mail.google.com/mail/ca"));
manifest_gmail.Set(extensions::manifest_keys::kWebURLs, list);
extension3_ = Extension::Create(base::FilePath(), Manifest::UNPACKED,
@@ -455,7 +455,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
void InsertPrefValue(base::ListValue* pref_value,
int index,
const std::string& extension_id) {
- base::DictionaryValue* entry = new DictionaryValue();
+ base::DictionaryValue* entry = new base::DictionaryValue();
entry->SetString(ash::kPinnedAppsPrefAppIDPath, extension_id);
pref_value->Insert(index, entry);
}
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 67e93e4..8aaf667 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -1203,7 +1203,7 @@ TEST_F(AutofillDialogControllerTest, AcceptLegalDocuments) {
// Now try it all over again with the location disclosure already accepted.
// Nothing should change.
Reset();
- ListValue preexisting_list;
+ base::ListValue preexisting_list;
preexisting_list.AppendString(kFakeEmail);
g_browser_process->local_state()->Set(
::prefs::kAutofillDialogWalletLocationAcceptance,
@@ -1230,7 +1230,7 @@ TEST_F(AutofillDialogControllerTest, RejectLegalDocuments) {
// Now try it all over again with the location disclosure already accepted.
// Nothing should change.
Reset();
- ListValue preexisting_list;
+ base::ListValue preexisting_list;
preexisting_list.AppendString(kFakeEmail);
g_browser_process->local_state()->Set(
::prefs::kAutofillDialogWalletLocationAcceptance,
@@ -1249,7 +1249,7 @@ TEST_F(AutofillDialogControllerTest, AcceptLocationDisclosure) {
EXPECT_TRUE(controller()->LegalDocumentLinks().empty());
controller()->OnAccept();
- const ListValue* list = g_browser_process->local_state()->GetList(
+ const base::ListValue* list = g_browser_process->local_state()->GetList(
::prefs::kAutofillDialogWalletLocationAcceptance);
ASSERT_EQ(1U, list->GetSize());
std::string accepted_username;
@@ -1264,7 +1264,7 @@ TEST_F(AutofillDialogControllerTest, AcceptLocationDisclosure) {
ASSERT_TRUE(list->empty());
std::string kOtherUsername("spouse@example.com");
- ListValue preexisting_list;
+ base::ListValue preexisting_list;
preexisting_list.AppendString(kOtherUsername);
g_browser_process->local_state()->Set(
::prefs::kAutofillDialogWalletLocationAcceptance,
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);
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index a98758a..2a72eca 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -338,7 +338,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
} else {
SettingInfo info;
HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
- scoped_ptr<Value> value(map->GetWebsiteSetting(
+ scoped_ptr<base::Value> value(map->GetWebsiteSetting(
url, url, content_type(), std::string(), &info));
setting = content_settings::ValueToContentSetting(value.get());
setting_source = info.source;
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index b0a9239..4548a79 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1871,7 +1871,7 @@ void BrowserWindowGtk::SaveWindowPosition() {
std::string window_name = chrome::GetWindowPlacementKey(browser_.get());
DictionaryPrefUpdate update(browser_->profile()->GetPrefs(),
window_name.c_str());
- DictionaryValue* window_preferences = update.Get();
+ base::DictionaryValue* window_preferences = update.Get();
// Note that we store left/top for consistency with Windows, but that we
// *don't* obey them; we only use them for computing width/height. See
// comments in SetGeometryHints().
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 43788e0..42dc87a 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -528,7 +528,7 @@ void TaskManagerGtk::SetInitialDialogSize() {
G_CALLBACK(OnTreeViewRealizeThunk), this);
// If we previously saved the dialog's bounds, use them.
if (g_browser_process->local_state()) {
- const DictionaryValue* placement_pref =
+ const base::DictionaryValue* placement_pref =
g_browser_process->local_state()->GetDictionary(
prefs::kTaskManagerWindowPlacement);
int top = 0, left = 0, bottom = 1, right = 1;
@@ -813,7 +813,7 @@ void TaskManagerGtk::OnResponse(GtkWidget* dialog, int response_id) {
DictionaryPrefUpdate update(g_browser_process->local_state(),
prefs::kTaskManagerWindowPlacement);
- DictionaryValue* placement_pref = update.Get();
+ base::DictionaryValue* placement_pref = update.Get();
// Note that we store left/top for consistency with Windows, but that we
// *don't* restore them.
placement_pref->SetInteger("left", dialog_bounds.x());
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index b3688c5..b19e171 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -554,12 +554,12 @@ NativePanelTesting* BasePanelBrowserTest::CreateNativePanelTesting(
scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
const base::FilePath::StringType& path,
extensions::Manifest::Location location,
- const DictionaryValue& extra_value) {
+ const base::DictionaryValue& extra_value) {
extensions::ExtensionPrefs* extension_prefs =
extensions::ExtensionPrefs::Get(browser()->profile());
base::FilePath full_path = extension_prefs->install_directory().Append(path);
- scoped_ptr<DictionaryValue> input_value(extra_value.DeepCopy());
+ scoped_ptr<base::DictionaryValue> input_value(extra_value.DeepCopy());
input_value->SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
input_value->SetString(extensions::manifest_keys::kName, "Sample Extension");
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h
index 2953dd1..bd5a10d4 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.h
+++ b/chrome/browser/ui/panels/base_panel_browser_test.h
@@ -105,7 +105,7 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
scoped_refptr<extensions::Extension> CreateExtension(
const base::FilePath::StringType& path,
extensions::Manifest::Location location,
- const DictionaryValue& extra_value);
+ const base::DictionaryValue& extra_value);
void MoveMouseAndWaitForExpansionStateChange(Panel* panel,
const gfx::Point& position);
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 5eb5764..a7456f9 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -93,9 +93,9 @@ PanelExtensionWindowController::CreateWindowValueWithTabs(
base::DictionaryValue* result = CreateWindowValue();
DCHECK(IsVisibleToExtension(extension));
- DictionaryValue* tab_value = CreateTabValue(extension, 0);
+ base::DictionaryValue* tab_value = CreateTabValue(extension, 0);
if (tab_value) {
- base::ListValue* tab_list = new ListValue();
+ base::ListValue* tab_list = new base::ListValue();
tab_list->Append(tab_value);
result->Set(extensions::tabs_constants::kTabsKey, tab_list);
}
@@ -112,7 +112,7 @@ base::DictionaryValue* PanelExtensionWindowController::CreateTabValue(
return NULL;
DCHECK(IsVisibleToExtension(extension));
- DictionaryValue* tab_value = new DictionaryValue();
+ base::DictionaryValue* tab_value = new base::DictionaryValue();
tab_value->SetInteger(extensions::tabs_constants::kIdKey,
SessionID::IdForTab(web_contents));
tab_value->SetInteger(extensions::tabs_constants::kIndexKey, 0);
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 80ef7a8..d129c1c 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -1378,7 +1378,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
NonExtensionDomainPanelsCloseOnUninstall) {
// Create a test extension.
- DictionaryValue empty_value;
+ base::DictionaryValue empty_value;
scoped_refptr<extensions::Extension> extension =
CreateExtension(FILE_PATH_LITERAL("TestExtension"),
extensions::Manifest::INTERNAL, empty_value);
diff --git a/chrome/browser/ui/panels/stacked_panel_browsertest.cc b/chrome/browser/ui/panels/stacked_panel_browsertest.cc
index 42103aa..9dc0ba7 100644
--- a/chrome/browser/ui/panels/stacked_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/stacked_panel_browsertest.cc
@@ -976,7 +976,7 @@ IN_PROC_BROWSER_TEST_F(StackedPanelBrowserTest,
PanelManager* panel_manager = PanelManager::GetInstance();
// Create 2 test extensions.
- DictionaryValue empty_value;
+ base::DictionaryValue empty_value;
scoped_refptr<extensions::Extension> extension1 =
CreateExtension(FILE_PATH_LITERAL("TestExtension1"),
extensions::Manifest::INTERNAL, empty_value);
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index 644552d..b549fdd 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -173,7 +173,7 @@ class PDFUnsupportedFeatureInterstitial
protected:
// InterstitialPageDelegate implementation.
virtual std::string GetHTMLContents() OVERRIDE {
- DictionaryValue strings;
+ base::DictionaryValue strings;
strings.SetString(
"title",
l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_TITLE));
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index a5779ef..86a734d 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -758,7 +758,7 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
// If email was already rejected by this profile for one-click sign-in.
if (can_offer_for == CAN_OFFER_FOR_INTERSTITAL_ONLY) {
- const ListValue* rejected_emails = profile->GetPrefs()->GetList(
+ const base::ListValue* rejected_emails = profile->GetPrefs()->GetList(
prefs::kReverseAutologinRejectedEmailList);
if (!rejected_emails->empty()) {
base::ListValue::const_iterator iter = rejected_emails->Find(
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 58cb52a..2327905 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -96,7 +96,7 @@ const base::FilePath::CharType kExtensionFilePath[] =
static scoped_refptr<extensions::Extension> CreateExtension(
const std::string& name,
const std::string& id) {
- DictionaryValue manifest;
+ base::DictionaryValue manifest;
manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
manifest.SetString(extensions::manifest_keys::kName, name);
std::string error;
diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc
index ebfd6aa..0140142 100644
--- a/chrome/browser/ui/tabs/pinned_tab_codec.cc
+++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc
@@ -39,20 +39,20 @@ static bool HasPinnedTabs(Browser* browser) {
}
// Adds a DictionaryValue to |values| representing |tab|.
-static void EncodeTab(const StartupTab& tab, ListValue* values) {
- scoped_ptr<DictionaryValue> value(new DictionaryValue);
+static void EncodeTab(const StartupTab& tab, base::ListValue* values) {
+ scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
value->SetString(kURL, tab.url.spec());
if (tab.is_app)
value->SetString(kAppID, tab.app_id);
values->Append(value.release());
}
-// Adds a DictionaryValue to |values| representing the pinned tab at the
+// Adds a base::DictionaryValue to |values| representing the pinned tab at the
// specified index.
static void EncodePinnedTab(TabStripModel* model,
int index,
- ListValue* values) {
- scoped_ptr<DictionaryValue> value(new DictionaryValue());
+ base::ListValue* values) {
+ scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
content::WebContents* web_contents = model->GetWebContentsAt(index);
if (model->IsAppTab(index)) {
@@ -78,7 +78,7 @@ static void EncodePinnedTab(TabStripModel* model,
}
// Invokes EncodePinnedTab for each pinned tab in browser.
-static void EncodePinnedTabs(Browser* browser, ListValue* values) {
+static void EncodePinnedTabs(Browser* browser, base::ListValue* values) {
TabStripModel* tab_model = browser->tab_strip_model();
for (int i = 0; i < tab_model->count() && tab_model->IsTabPinned(i); ++i)
EncodePinnedTab(tab_model, i, values);
@@ -86,7 +86,7 @@ static void EncodePinnedTabs(Browser* browser, ListValue* values) {
// Decodes the previously written values in |value| to |tab|, returning true
// on success.
-static bool DecodeTab(const DictionaryValue& value, StartupTab* tab) {
+static bool DecodeTab(const base::DictionaryValue& value, StartupTab* tab) {
tab->is_app = false;
std::string url_string;
@@ -113,7 +113,7 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile) {
if (!prefs)
return;
- ListValue values;
+ base::ListValue values;
for (chrome::BrowserIterator it; !it.done(); it.Next()) {
Browser* browser = *it;
if (browser->is_type_tabbed() &&
@@ -132,7 +132,7 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile,
return;
ListPrefUpdate update(prefs, prefs::kPinnedTabs);
- ListValue* values = update.Get();
+ base::ListValue* values = update.Get();
values->Clear();
for (StartupTabs::const_iterator i = tabs.begin(); i != tabs.end(); ++i)
EncodeTab(*i, values);
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index fd2481a..0e520a0 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -1783,7 +1783,7 @@ TEST_F(TabStripModelTest, Apps) {
base::FilePath path(FILE_PATH_LITERAL("/foo"));
#endif
- DictionaryValue manifest;
+ base::DictionaryValue manifest;
manifest.SetString("name", "hi!");
manifest.SetString("version", "1");
manifest.SetString("app.launch.web_url", "http://www.google.com");
diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc
index 35427fa..474a8d1 100644
--- a/chrome/browser/ui/views/about_ipc_dialog.cc
+++ b/chrome/browser/ui/views/about_ipc_dialog.cc
@@ -128,7 +128,7 @@ void CloseDialog() {
PrefService* prefs = current_profile->GetPrefs();
if (!prefs->FindPreference(prefs::kIpcDisabledMessages))
return;
- ListValue* list = prefs->GetMutableList(prefs::kIpcDisabledMessages);
+ base::ListValue* list = prefs->GetMutableList(prefs::kIpcDisabledMessages);
list->Clear();
for (std::set<int>::const_iterator itr = disabled_messages_.begin();
itr != disabled_messages_.end();
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index b1faf5a..8bb3526 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -79,7 +79,7 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
DCHECK(prefs->FindPreference(window_name.c_str()));
DictionaryPrefUpdate update(prefs, window_name.c_str());
- DictionaryValue* window_preferences = update.Get();
+ base::DictionaryValue* window_preferences = update.Get();
window_preferences->SetInteger("left", bounds.x());
window_preferences->SetInteger("top", bounds.y());
window_preferences->SetInteger("right", bounds.right());
@@ -104,7 +104,8 @@ bool ChromeViewsDelegate::GetSavedWindowPlacement(
return false;
DCHECK(prefs->FindPreference(window_name.c_str()));
- const DictionaryValue* dictionary = prefs->GetDictionary(window_name.c_str());
+ const base::DictionaryValue* dictionary =
+ prefs->GetDictionary(window_name.c_str());
int left, top, right, bottom;
if (!dictionary || !dictionary->GetInteger("left", &left) ||
!dictionary->GetInteger("top", &top) ||
--
cgit v1.1