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

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

Issue 2208973003: Add some extra height to bookmark bar if the font wants to be larger (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address various nits from code review comments Created 4 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
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 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 // Updates the visibility of the apps shortcut based on the pref value. 378 // Updates the visibility of the apps shortcut based on the pref value.
379 void OnAppsPageShortcutVisibilityPrefChanged(); 379 void OnAppsPageShortcutVisibilityPrefChanged();
380 380
381 void OnShowManagedBookmarksPrefChanged(); 381 void OnShowManagedBookmarksPrefChanged();
382 382
383 void LayoutAndPaint() { 383 void LayoutAndPaint() {
384 Layout(); 384 Layout();
385 SchedulePaint(); 385 SchedulePaint();
386 } 386 }
387 387
388 int GetPreferredHeight() const;
389
388 // Needed to react to kShowAppsShortcutInBookmarkBar changes. 390 // Needed to react to kShowAppsShortcutInBookmarkBar changes.
389 PrefChangeRegistrar profile_pref_registrar_; 391 PrefChangeRegistrar profile_pref_registrar_;
390 392
391 // Used for opening urls. 393 // Used for opening urls.
392 content::PageNavigator* page_navigator_; 394 content::PageNavigator* page_navigator_;
393 395
394 // BookmarkModel that owns the entries and folders that are shown in this 396 // BookmarkModel that owns the entries and folders that are shown in this
395 // view. This is owned by the Profile. 397 // view. This is owned by the Profile.
396 bookmarks::BookmarkModel* model_; 398 bookmarks::BookmarkModel* model_;
397 399
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 458
457 base::ObserverList<BookmarkBarViewObserver> observers_; 459 base::ObserverList<BookmarkBarViewObserver> observers_;
458 460
459 // Factory used to delay showing of the drop menu. 461 // Factory used to delay showing of the drop menu.
460 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_; 462 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
461 463
462 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 464 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
463 }; 465 };
464 466
465 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 467 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698