diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 20:08:21 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 20:08:21 +0000 |
commit | dbb9aa45617ebf4b521f066b3cd69a06b5a627d4 (patch) | |
tree | 031ecfb8c98d2a211d4a9e91064cb86622e29307 /chrome/browser/ui/panels | |
parent | cb1078deccdc5b13af302c2cf83fce308e534490 (diff) | |
download | chromium_src-dbb9aa45617ebf4b521f066b3cd69a06b5a627d4.zip chromium_src-dbb9aa45617ebf4b521f066b3cd69a06b5a627d4.tar.gz chromium_src-dbb9aa45617ebf4b521f066b3cd69a06b5a627d4.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/ui/panels')
-rw-r--r-- | chrome/browser/ui/panels/base_panel_browser_test.cc | 4 | ||||
-rw-r--r-- | chrome/browser/ui/panels/base_panel_browser_test.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/panels/panel.cc | 6 | ||||
-rw-r--r-- | chrome/browser/ui/panels/panel_browsertest.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/panels/stacked_panel_browsertest.cc | 2 |
5 files changed, 8 insertions, 8 deletions
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); |