Skip to content

GitLab

T
tangled
Commit 1a85132a authored by mukai's avatar mukai Committed by Commit bot
Browse files
Options

Move basic string operations to ui/app_list/search 

BUG=380875
R=xiyuan@chromium.org
TEST=build succeeds

Review URL: https://codereview.chromium.org/522683003

Cr-Commit-Position: refs/heads/master@{#292990}
parent d5753cc0
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 45 deletions
chrome/browser/ui/app_list/search/app_result.cc
View file @ 1a85132a
......@@ -10,8 +10,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/app_context_menu.h"
#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
#include "chrome/browser/ui/app_list/search/tokenized_string.h"
#include "chrome/browser/ui/app_list/search/tokenized_string_match.h"
#include "chrome/browser/ui/extensions/extension_enable_flow.h"
#include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
#include "content/public/browser/user_metrics.h"
......@@ -24,6 +22,8 @@
#include "extensions/common/extension_icon_set.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/search/tokenized_string.h"
#include "ui/app_list/search/tokenized_string_match.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image_skia_operations.h"
......
chrome/browser/ui/app_list/search/app_search_provider.cc
View file @ 1a85132a
......@@ -12,13 +12,13 @@
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/search/app_result.h"
#include "chrome/browser/ui/app_list/search/tokenized_string.h"
#include "chrome/browser/ui/app_list/search/tokenized_string_match.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"
#include "ui/app_list/search/tokenized_string.h"
#include "ui/app_list/search/tokenized_string_match.h"
using extensions::ExtensionRegistry;
......
chrome/browser/ui/app_list/search/history.cc
View file @ 1a85132a
......@@ -9,8 +9,8 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/app_list/search/history_data.h"
#include "chrome/browser/ui/app_list/search/history_data_store.h"
#include "chrome/browser/ui/app_list/search/tokenized_string.h"
#include "content/public/browser/browser_context.h"
#include "ui/app_list/search/tokenized_string.h"
namespace app_list {
......
chrome/chrome_browser_ui.gypi
View file @ 1a85132a
......@@ -1232,14 +1232,6 @@
'browser/ui/app_list/search/search_controller.h',
'browser/ui/app_list/search/search_webstore_result.cc',
'browser/ui/app_list/search/search_webstore_result.h',
'browser/ui/app_list/search/term_break_iterator.cc',
'browser/ui/app_list/search/term_break_iterator.h',
'browser/ui/app_list/search/tokenized_string.cc',
'browser/ui/app_list/search/tokenized_string.h',
'browser/ui/app_list/search/tokenized_string_char_iterator.cc',
'browser/ui/app_list/search/tokenized_string_char_iterator.h',
'browser/ui/app_list/search/tokenized_string_match.cc',
'browser/ui/app_list/search/tokenized_string_match.h',
'browser/ui/app_list/search/webstore/webstore_installer.cc',
'browser/ui/app_list/search/webstore/webstore_installer.h',
'browser/ui/app_list/search/webstore/webstore_provider.cc',
......
chrome/chrome_tests_unit.gypi
View file @ 1a85132a
......@@ -2122,10 +2122,6 @@
'browser/ui/app_list/search/history_unittest.cc',
'browser/ui/app_list/search/history_data_store_unittest.cc',
'browser/ui/app_list/search/mixer_unittest.cc',
'browser/ui/app_list/search/term_break_iterator_unittest.cc',
'browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc',
'browser/ui/app_list/search/tokenized_string_match_unittest.cc',
'browser/ui/app_list/search/tokenized_string_unittest.cc',
],
'dependencies': [
'../ash/ash.gyp:ash_test_support',
......
ui/app_list/BUILD.gn
View file @ 1a85132a
......@@ -38,6 +38,14 @@ component("app_list") {
"search_provider.h",
"search_result.cc",
"search_result.h",
"search/term_break_iterator.cc",
"search/term_break_iterator.h",
"search/tokenized_string.cc",
"search/tokenized_string.h",
"search/tokenized_string_char_iterator.cc",
"search/tokenized_string_char_iterator.h",
"search/tokenized_string_match.cc",
"search/tokenized_string_match.h",
"speech_ui_model.cc",
"speech_ui_model.h",
"speech_ui_model_observer.h",
......@@ -50,6 +58,7 @@ component("app_list") {
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//skia",
"//third_party/icu",
"//ui/accessibility",
"//ui/base",
"//ui/compositor",
......@@ -158,7 +167,7 @@ component("app_list") {
"cocoa/scroll_view_with_no_scrollbars.mm",
]
deps += [
#'../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', TODO(GYP)
#"../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac", TODO(GYP)
]
libs = [ "QuartzCore.framework" ]
}
......@@ -186,6 +195,10 @@ test("app_list_unittests") {
"app_list_item_list_unittest.cc",
"app_list_model_unittest.cc",
"pagination_model_unittest.cc",
"search/term_break_iterator_unittest.cc",
"search/tokenized_string_char_iterator_unittest.cc",
"search/tokenized_string_match_unittest.cc",
"search/tokenized_string_unittest.cc",
"test/run_all_unittests.cc",
]
......
ui/app_list/app_list.gyp
View file @ 1a85132a
......@@ -23,6 +23,7 @@
'../gfx/gfx.gyp:gfx_geometry',
'../resources/ui_resources.gyp:ui_resources',
'../strings/ui_strings.gyp:ui_strings',
'../../third_party/icu/icu.gyp:icuuc',
],
'defines': [
'APP_LIST_IMPLEMENTATION',
......@@ -84,6 +85,14 @@
'search_provider.h',
'search_result.cc',
'search_result.h',
'search/term_break_iterator.cc',
'search/term_break_iterator.h',
'search/tokenized_string.cc',
'search/tokenized_string.h',
'search/tokenized_string_char_iterator.cc',
'search/tokenized_string_char_iterator.h',
'search/tokenized_string_match.cc',
'search/tokenized_string_match.h',
'speech_ui_model.cc',
'speech_ui_model.h',
'speech_ui_model_observer.h',
......@@ -225,6 +234,10 @@
'cocoa/apps_search_results_controller_unittest.mm',
'cocoa/test/apps_grid_controller_test_helper.h',
'cocoa/test/apps_grid_controller_test_helper.mm',
'search/term_break_iterator_unittest.cc',
'search/tokenized_string_char_iterator_unittest.cc',
'search/tokenized_string_match_unittest.cc',
'search/tokenized_string_unittest.cc',
'test/run_all_unittests.cc',
'views/app_list_main_view_unittest.cc',
'views/app_list_view_unittest.cc',
......
chrome/browser/ui/app_list/search/term_break_iterator.cc → ui/app_list/search/term_break_iterator.cc
View file @ 1a85132a
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/term_break_iterator.h"
#include "ui/app_list/search/term_break_iterator.h"
#include "base/i18n/char_iterator.h"
#include "base/logging.h"
......
chrome/browser/ui/app_list/search/term_break_iterator.h → ui/app_list/search/term_break_iterator.h
View file @ 1a85132a
......@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
#ifndef UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
#define UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
namespace base {
namespace i18n {
......@@ -23,7 +24,7 @@ namespace app_list {
// e.g.
// CamelCase -> Camel, Case
// Python2.7 -> Python, 2.7
class TermBreakIterator {
class APP_LIST_EXPORT TermBreakIterator {
public:
// Note that |word| must out live this iterator.
explicit TermBreakIterator(const base::string16& word);
......@@ -66,4 +67,4 @@ class TermBreakIterator {
} // namespace app_list
#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
#endif // UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc → ui/app_list/search/term_break_iterator_unittest.cc
View file @ 1a85132a
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/term_break_iterator.h"
#include "ui/app_list/search/term_break_iterator.h"
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
......
chrome/browser/ui/app_list/search/tokenized_string.cc → ui/app_list/search/tokenized_string.cc
View file @ 1a85132a
......@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/tokenized_string.h"
#include "ui/app_list/search/tokenized_string.h"
#include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h"
#include "base/logging.h"
#include "chrome/browser/ui/app_list/search/term_break_iterator.h"
#include "ui/app_list/search/term_break_iterator.h"
using base::i18n::BreakIterator;
......
chrome/browser/ui/app_list/search/tokenized_string.h → ui/app_list/search/tokenized_string.h
View file @ 1a85132a
......@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_
#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_
#ifndef UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_
#define UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_
#include <vector>
#include "base/basictypes.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/gfx/range/range.h"
namespace app_list {
......@@ -16,7 +17,7 @@ namespace app_list {
// TokenizedString takes a string and breaks it down into token words. It
// first breaks using BreakIterator to get all the words. Then it breaks
// the words again at camel case boundaries and alpha/number boundaries.
class TokenizedString {
class APP_LIST_EXPORT TokenizedString {
public:
typedef std::vector<base::string16> Tokens;
typedef std::vector<gfx::Range> Mappings;
......@@ -43,4 +44,4 @@ class TokenizedString {
} // namespace app_list
#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_
#endif // UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_
chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc → ui/app_list/search/tokenized_string_char_iterator.cc
View file @ 1a85132a
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h"
#include "ui/app_list/search/tokenized_string_char_iterator.h"
#include "base/i18n/char_iterator.h"
#include "base/logging.h"
......
chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h → ui/app_list/search/tokenized_string_char_iterator.h
View file @ 1a85132a
......@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_
#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_
#ifndef UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_
#define UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/app_list/search/tokenized_string.h"
#include "ui/app_list/app_list_export.h"
#include "ui/app_list/search/tokenized_string.h"
namespace base {
namespace i18n {
......@@ -18,7 +19,7 @@ class UTF16CharIterator;
namespace app_list {
// An UTF16 char iterator for a TokenizedString.
class TokenizedStringCharIterator {
class APP_LIST_EXPORT TokenizedStringCharIterator {
public:
struct State {
State();
......@@ -73,4 +74,4 @@ class TokenizedStringCharIterator {
} // namespace app_list
#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_
#endif // UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_
chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc → ui/app_list/search/tokenized_string_char_iterator_unittest.cc
View file @ 1a85132a
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h"
#include "ui/app_list/search/tokenized_string_char_iterator.h"
#include <string>
#include <vector>
......
chrome/browser/ui/app_list/search/tokenized_string_match.cc → ui/app_list/search/tokenized_string_match.cc
View file @ 1a85132a
......@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/tokenized_string_match.h"
#include "ui/app_list/search/tokenized_string_match.h"
#include "base/i18n/string_search.h"
#include "base/logging.h"
#include "chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h"
#include "ui/app_list/search/tokenized_string_char_iterator.h"
namespace app_list {
......
chrome/browser/ui/app_list/search/tokenized_string_match.h → ui/app_list/search/tokenized_string_match.h
View file @ 1a85132a
......@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_
#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_
#ifndef UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_
#define UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_
#include <vector>
#include "base/basictypes.h"
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/gfx/range/range.h"
namespace app_list {
......@@ -21,7 +22,7 @@ class TokenizedString;
// of text. A relevance of zero means the two are completely different to each
// other. The higher the relevance score, the better the two strings are
// matched. Matched portions of text are stored as index ranges.
class TokenizedStringMatch {
class APP_LIST_EXPORT TokenizedStringMatch {
public:
typedef std::vector<gfx::Range> Hits;
......@@ -50,4 +51,4 @@ class TokenizedStringMatch {
} // namespace app_list
#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_
#endif // UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_
chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc → ui/app_list/search/tokenized_string_match_unittest.cc
View file @ 1a85132a
......@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ui/app_list/search/tokenized_string_match.h"
#include <string>
#include "base/basictypes.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/app_list/search/tokenized_string_match.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace app_list {
......
chrome/browser/ui/app_list/search/tokenized_string_unittest.cc → ui/app_list/search/tokenized_string_unittest.cc
View file @ 1a85132a
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/app_list/search/tokenized_string.h"
#include "ui/app_list/search/tokenized_string.h"
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
......
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