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

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

Issue 312673006: Added a policy to control the visibility of the apps shortcut. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 ui::MenuSourceType source_type) OVERRIDE; 253 ui::MenuSourceType source_type) OVERRIDE;
254 254
255 private: 255 private:
256 class ButtonSeparatorView; 256 class ButtonSeparatorView;
257 struct DropInfo; 257 struct DropInfo;
258 struct DropLocation; 258 struct DropLocation;
259 259
260 friend class BookmarkBarViewEventTestBase; 260 friend class BookmarkBarViewEventTestBase;
261 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile); 261 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile);
262 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, 262 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest,
263 NoAppsShortcutWithoutInstantExtended); 263 NoAppsShortcutWithoutInstantExtended);
Joao da Silva 2014/06/03 22:20:52 FYI, this test doesn't seem to exist anymore.
264 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewInstantExtendedTest, 264 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewInstantExtendedTest,
265 AppsShortcutVisibility); 265 AppsShortcutVisibility);
266 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewInstantExtendedTest,
267 ManagedShowAppsShortcutInBookmarksBar);
268
sky 2014/06/03 16:15:07 nit: only one newline.
Joao da Silva 2014/06/03 22:20:52 Done.
266 269
267 // Used to identify what the user is dropping onto. 270 // Used to identify what the user is dropping onto.
268 enum DropButtonType { 271 enum DropButtonType {
269 DROP_BOOKMARK, 272 DROP_BOOKMARK,
270 DROP_OTHER_FOLDER, 273 DROP_OTHER_FOLDER,
271 DROP_OVERFLOW 274 DROP_OVERFLOW
272 }; 275 };
273 276
274 // Creates recent bookmark button and when visible button as well as 277 // Creates recent bookmark button and when visible button as well as
275 // calculating the preferred height. 278 // calculating the preferred height.
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 438
436 BookmarkBar::State bookmark_bar_state_; 439 BookmarkBar::State bookmark_bar_state_;
437 440
438 // Are we animating to or from the detached state? 441 // Are we animating to or from the detached state?
439 bool animating_detached_; 442 bool animating_detached_;
440 443
441 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 444 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
442 }; 445 };
443 446
444 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 447 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698