Commit 561f2872 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Rename LoginTableColumns (components/password_manager)

When building using jumbo, files gets merged and enums
with the same name may end up in the same namespace and
conflict. This happens for he enum LoginTableColumns.

This commit solves the issue by renaming one instance
of LoginTableColumns to something more file specific.

Bug: 869381
Change-Id: I9a0b95dcddee3bbc9f1b8969142aa683e11025a0
Reviewed-on: https://chromium-review.googlesource.com/1160496Reviewed-by: default avatarVadym Doroshenko <dvadym@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#580482}
parent 550a1c4a
...@@ -81,7 +81,7 @@ autofill::ValueElementVector DeserializeValueElementPairs( ...@@ -81,7 +81,7 @@ autofill::ValueElementVector DeserializeValueElementPairs(
namespace { namespace {
// Convenience enum for interacting with SQL queries that use all the columns. // Convenience enum for interacting with SQL queries that use all the columns.
enum LoginTableColumns { enum LoginDatabaseTableColumns {
COLUMN_ORIGIN_URL = 0, COLUMN_ORIGIN_URL = 0,
COLUMN_ACTION_URL, COLUMN_ACTION_URL,
COLUMN_USERNAME_ELEMENT, COLUMN_USERNAME_ELEMENT,
...@@ -448,7 +448,8 @@ void InitializeBuilder(SQLTableBuilder* builder) { ...@@ -448,7 +448,8 @@ void InitializeBuilder(SQLTableBuilder* builder) {
DCHECK_EQ(19u, version); DCHECK_EQ(19u, version);
DCHECK_EQ(static_cast<size_t>(COLUMN_NUM), builder->NumberOfColumns()) DCHECK_EQ(static_cast<size_t>(COLUMN_NUM), builder->NumberOfColumns())
<< "Adjust LoginTableColumns if you change column definitions here."; << "Adjust LoginDatabaseTableColumns if you change column definitions "
"here.";
} }
// Call this after having called InitializeBuilder, to migrate the database from // Call this after having called InitializeBuilder, to migrate the database from
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment