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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 11876036: Alternate NTP: Don't hide bookmark bar on instant (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more test Created 7 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')
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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH, 522 BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH,
523 523
524 // Change is the result of the bookmark bar pref changing. 524 // Change is the result of the bookmark bar pref changing.
525 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, 525 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE,
526 526
527 // Change is the result of a state change in the active tab. 527 // Change is the result of a state change in the active tab.
528 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, 528 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE,
529 529
530 // Change is the result of window toggling in/out of fullscreen mode. 530 // Change is the result of window toggling in/out of fullscreen mode.
531 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, 531 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN,
532
533 // Change is the result of a state change in the instant preview.
534 BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE,
535 }; 532 };
536 533
537 // Overridden from content::WebContentsDelegate: 534 // Overridden from content::WebContentsDelegate:
538 virtual content::WebContents* OpenURLFromTab( 535 virtual content::WebContents* OpenURLFromTab(
539 content::WebContents* source, 536 content::WebContents* source,
540 const content::OpenURLParams& params) OVERRIDE; 537 const content::OpenURLParams& params) OVERRIDE;
541 virtual void NavigationStateChanged(const content::WebContents* source, 538 virtual void NavigationStateChanged(const content::WebContents* source,
542 unsigned changed_flags) OVERRIDE; 539 unsigned changed_flags) OVERRIDE;
543 virtual void AddNewContents(content::WebContents* source, 540 virtual void AddNewContents(content::WebContents* source,
544 content::WebContents* new_contents, 541 content::WebContents* new_contents,
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 bool window_has_shown_; 937 bool window_has_shown_;
941 938
942 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 939 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
943 // before DidEndColorChooser is called. 940 // before DidEndColorChooser is called.
944 scoped_ptr<content::ColorChooser> color_chooser_; 941 scoped_ptr<content::ColorChooser> color_chooser_;
945 942
946 DISALLOW_COPY_AND_ASSIGN(Browser); 943 DISALLOW_COPY_AND_ASSIGN(Browser);
947 }; 944 };
948 945
949 #endif // CHROME_BROWSER_UI_BROWSER_H_ 946 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698