chrome/browser/ui/bookmarks/bookmark_utils.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_utils.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_editor.cc ('k') | chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	5 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

10 #include "base/strings/string_number_conversions.h"	10 #include "base/strings/string_number_conversions.h"

11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

12 #include "chrome/browser/extensions/api/commands/command_service.h"	12 #include "chrome/browser/extensions/api/commands/command_service.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/search/search.h"	14 #include "chrome/browser/search/search.h"

15 #include "chrome/browser/ui/app_list/app_list_util.h"	15 #include "chrome/browser/ui/app_list/app_list_util.h"

16 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"	16 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"

17 #include "chrome/browser/ui/browser.h"	17 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/browser_navigator.h"	18 #include "chrome/browser/ui/browser_navigator.h"

19 #include "chrome/browser/ui/browser_window.h"	19 #include "chrome/browser/ui/browser_window.h"

20 #include "chrome/browser/ui/simple_message_box.h"	20 #include "chrome/browser/ui/simple_message_box.h"

21 #include "chrome/browser/ui/tabs/tab_strip_model.h"	21 #include "chrome/browser/ui/tabs/tab_strip_model.h"

22 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

23 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

	24 #include "chrome/grit/chromium_strings.h"

	25 #include "chrome/grit/generated_resources.h"

24 #include "components/bookmarks/browser/bookmark_model.h"	26 #include "components/bookmarks/browser/bookmark_model.h"

25 #include "components/search/search.h"	27 #include "components/search/search.h"

26 #include "components/user_prefs/user_prefs.h"	28 #include "components/user_prefs/user_prefs.h"

27 #include "content/public/browser/web_contents.h"	29 #include "content/public/browser/web_contents.h"

28 #include "extensions/browser/extension_registry.h"	30 #include "extensions/browser/extension_registry.h"

29 #include "extensions/common/extension_set.h"	31 #include "extensions/common/extension_set.h"

30 #include "grit/chromium_strings.h"

31 #include "grit/generated_resources.h"

32 #include "net/base/net_util.h"	32 #include "net/base/net_util.h"

33 #include "ui/base/l10n/l10n_util.h"	33 #include "ui/base/l10n/l10n_util.h"

34	34

35 namespace chrome {	35 namespace chrome {

36	36

37 int num_bookmark_urls_before_prompting = 15;	37 int num_bookmark_urls_before_prompting = 15;

38	38

39 namespace {	39 namespace {

40	40

41 // The ways in which extensions may customize the bookmark shortcut.	41 // The ways in which extensions may customize the bookmark shortcut.

(...skipping 314 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
356 i != extension_set.end();	356 i != extension_set.end();

357 ++i) {	357 ++i) {

358 if (extensions::CommandService::RemovesBookmarkOpenPagesShortcut(*i))	358 if (extensions::CommandService::RemovesBookmarkOpenPagesShortcut(*i))

359 return true;	359 return true;

360 }	360 }

361	361

362 return false;	362 return false;

363 }	363 }

364	364

365 } // namespace chrome	365 } // namespace chrome

OLD	NEW