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

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

Issue 2065653002: Vertically align text on empty bookmarks bar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed descend/ascent calculations and alignment code from GetPreferredSize() Created 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc » ('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 (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_INSTRUCTIONS_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/views/context_menu_controller.h" 10 #include "ui/views/context_menu_controller.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 const gfx::Point& point, 48 const gfx::Point& point,
49 ui::MenuSourceType source_type) override; 49 ui::MenuSourceType source_type) override;
50 50
51 void UpdateColors(); 51 void UpdateColors();
52 52
53 BookmarkBarInstructionsDelegate* delegate_; 53 BookmarkBarInstructionsDelegate* delegate_;
54 54
55 views::Label* instructions_; 55 views::Label* instructions_;
56 views::Link* import_link_; 56 views::Link* import_link_;
57 57
58 // The baseline of the child views. This is -1 if none of the views support a
59 // baseline.
60 int baseline_;
61
62 // Have the colors of the child views been updated? This is initially false 58 // Have the colors of the child views been updated? This is initially false
63 // and set to true once we have a valid ThemeProvider. 59 // and set to true once we have a valid ThemeProvider.
64 bool updated_colors_; 60 bool updated_colors_;
65 61
66 DISALLOW_COPY_AND_ASSIGN(BookmarkBarInstructionsView); 62 DISALLOW_COPY_AND_ASSIGN(BookmarkBarInstructionsView);
67 }; 63 };
68 64
69 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698