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

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

Issue 16172005: Clean up async app launcher enabled checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 7 years, 6 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 #include <string> 9 #include <string>
10 10
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 366
367 // This method computes the bounds for the bookmark bar items. If 367 // This method computes the bounds for the bookmark bar items. If
368 // |compute_bounds_only| = TRUE, the bounds for the items are just computed, 368 // |compute_bounds_only| = TRUE, the bounds for the items are just computed,
369 // but are not set. This mode is used by GetPreferredSize() to obtain the 369 // but are not set. This mode is used by GetPreferredSize() to obtain the
370 // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set. 370 // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set.
371 gfx::Size LayoutItems(bool compute_bounds_only); 371 gfx::Size LayoutItems(bool compute_bounds_only);
372 372
373 // Updates the visibility of the apps shortcut based on the pref value. 373 // Updates the visibility of the apps shortcut based on the pref value.
374 void OnAppsPageShortcutVisibilityPrefChanged(); 374 void OnAppsPageShortcutVisibilityPrefChanged();
375 375
376 // Called when we know whether the app launcher is enabled.
377 void OnAppLauncherEnabledCompleted(bool app_launcher_enabled);
378
379 // Needed to react to kShowAppsShortcutInBookmarkBar changes. 376 // Needed to react to kShowAppsShortcutInBookmarkBar changes.
380 PrefChangeRegistrar profile_pref_registrar_; 377 PrefChangeRegistrar profile_pref_registrar_;
381 378
382 // Used for opening urls. 379 // Used for opening urls.
383 content::PageNavigator* page_navigator_; 380 content::PageNavigator* page_navigator_;
384 381
385 // Model providing details as to the starred entries/folders that should be 382 // Model providing details as to the starred entries/folders that should be
386 // shown. This is owned by the Profile. 383 // shown. This is owned by the Profile.
387 BookmarkModel* model_; 384 BookmarkModel* model_;
388 385
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 433
437 BookmarkBar::State bookmark_bar_state_; 434 BookmarkBar::State bookmark_bar_state_;
438 435
439 // Are we animating to or from the detached state? 436 // Are we animating to or from the detached state?
440 bool animating_detached_; 437 bool animating_detached_;
441 438
442 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 439 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
443 }; 440 };
444 441
445 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 442 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/extension_install_ui_default.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698