Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_desktop.h" 5 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/grit/chromium_strings.h" 24 #include "chrome/grit/chromium_strings.h"
25 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
26 #include "components/bookmarks/browser/bookmark_model.h" 26 #include "components/bookmarks/browser/bookmark_model.h"
27 #include "components/bookmarks/browser/bookmark_node_data.h" 27 #include "components/bookmarks/browser/bookmark_node_data.h"
28 #include "components/bookmarks/browser/bookmark_utils.h" 28 #include "components/bookmarks/browser/bookmark_utils.h"
29 #include "components/prefs/pref_service.h" 29 #include "components/prefs/pref_service.h"
30 #include "components/search/search.h" 30 #include "components/search/search.h"
31 #include "components/url_formatter/url_formatter.h" 31 #include "components/url_formatter/url_formatter.h"
32 #include "components/user_prefs/user_prefs.h" 32 #include "components/user_prefs/user_prefs.h"
33 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
34 #include "extensions/features/features.h"
34 #include "ui/base/dragdrop/drag_drop_types.h" 35 #include "ui/base/dragdrop/drag_drop_types.h"
35 #include "ui/base/dragdrop/drop_target_event.h" 36 #include "ui/base/dragdrop/drop_target_event.h"
36 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
37 38
38 #if defined(ENABLE_EXTENSIONS) 39 #if BUILDFLAG(ENABLE_EXTENSIONS)
39 #include "chrome/browser/extensions/api/commands/command_service.h" 40 #include "chrome/browser/extensions/api/commands/command_service.h"
40 #include "extensions/browser/extension_registry.h" 41 #include "extensions/browser/extension_registry.h"
41 #include "extensions/common/extension_set.h" 42 #include "extensions/common/extension_set.h"
42 #endif 43 #endif
43 44
44 #if defined(TOOLKIT_VIEWS) 45 #if defined(TOOLKIT_VIEWS)
45 #include "ui/gfx/color_palette.h" 46 #include "ui/gfx/color_palette.h"
46 #include "ui/gfx/paint_vector_icon.h" 47 #include "ui/gfx/paint_vector_icon.h"
47 #include "ui/gfx/vector_icons_public.h" 48 #include "ui/gfx/vector_icons_public.h"
48 #endif 49 #endif
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 while (iterator.has_next()) { 266 while (iterator.has_next()) {
266 const GURL* url = iterator.NextURL(); 267 const GURL* url = iterator.NextURL();
267 if (IsURLAllowedInIncognito(*url, browser_context)) 268 if (IsURLAllowedInIncognito(*url, browser_context))
268 return true; 269 return true;
269 } 270 }
270 return false; 271 return false;
271 } 272 }
272 #endif // !defined(OS_ANDROID) 273 #endif // !defined(OS_ANDROID)
273 274
274 } // namespace chrome 275 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698