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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
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/views/bookmarks/bookmark_bar_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <limits> 10 #include <limits>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/prefs/pref_service.h"
20 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
21 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
22 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
23 #include "base/thread_task_runner_handle.h" 22 #include "base/thread_task_runner_handle.h"
24 #include "build/build_config.h" 23 #include "build/build_config.h"
25 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 24 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
26 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 25 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
27 #include "chrome/browser/browser_process.h" 26 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/chrome_notification_types.h" 27 #include "chrome/browser/chrome_notification_types.h"
29 #include "chrome/browser/defaults.h" 28 #include "chrome/browser/defaults.h"
(...skipping 24 matching lines...) Expand all
54 #include "chrome/common/url_constants.h" 53 #include "chrome/common/url_constants.h"
55 #include "chrome/grit/generated_resources.h" 54 #include "chrome/grit/generated_resources.h"
56 #include "components/bookmarks/browser/bookmark_model.h" 55 #include "components/bookmarks/browser/bookmark_model.h"
57 #include "components/bookmarks/browser/bookmark_utils.h" 56 #include "components/bookmarks/browser/bookmark_utils.h"
58 #include "components/bookmarks/common/bookmark_pref_names.h" 57 #include "components/bookmarks/common/bookmark_pref_names.h"
59 #include "components/bookmarks/managed/managed_bookmark_service.h" 58 #include "components/bookmarks/managed/managed_bookmark_service.h"
60 #include "components/browser_sync/browser/profile_sync_service.h" 59 #include "components/browser_sync/browser/profile_sync_service.h"
61 #include "components/metrics/metrics_service.h" 60 #include "components/metrics/metrics_service.h"
62 #include "components/omnibox/browser/omnibox_popup_model.h" 61 #include "components/omnibox/browser/omnibox_popup_model.h"
63 #include "components/omnibox/browser/omnibox_view.h" 62 #include "components/omnibox/browser/omnibox_view.h"
63 #include "components/prefs/pref_service.h"
64 #include "components/url_formatter/elide_url.h" 64 #include "components/url_formatter/elide_url.h"
65 #include "content/public/browser/notification_details.h" 65 #include "content/public/browser/notification_details.h"
66 #include "content/public/browser/notification_source.h" 66 #include "content/public/browser/notification_source.h"
67 #include "content/public/browser/page_navigator.h" 67 #include "content/public/browser/page_navigator.h"
68 #include "content/public/browser/render_view_host.h" 68 #include "content/public/browser/render_view_host.h"
69 #include "content/public/browser/render_widget_host_view.h" 69 #include "content/public/browser/render_widget_host_view.h"
70 #include "content/public/browser/user_metrics.h" 70 #include "content/public/browser/user_metrics.h"
71 #include "content/public/browser/web_contents.h" 71 #include "content/public/browser/web_contents.h"
72 #include "extensions/browser/extension_registry.h" 72 #include "extensions/browser/extension_registry.h"
73 #include "extensions/common/extension.h" 73 #include "extensions/common/extension.h"
(...skipping 2016 matching lines...) Expand 10 before | Expand all | Expand 10 after
2090 return; 2090 return;
2091 apps_page_shortcut_->SetVisible(visible); 2091 apps_page_shortcut_->SetVisible(visible);
2092 UpdateBookmarksSeparatorVisibility(); 2092 UpdateBookmarksSeparatorVisibility();
2093 LayoutAndPaint(); 2093 LayoutAndPaint();
2094 } 2094 }
2095 2095
2096 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() { 2096 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
2097 if (UpdateOtherAndManagedButtonsVisibility()) 2097 if (UpdateOtherAndManagedButtonsVisibility())
2098 LayoutAndPaint(); 2098 LayoutAndPaint();
2099 } 2099 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698