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

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

Issue 11644009: Added support for passing WindowOpenDisposition into BrowserInstantController::OpenURL() from the o… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_INSTANT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/prefs/public/pref_change_registrar.h" 10 #include "base/prefs/public/pref_change_registrar.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void ActiveTabChanged(); 94 void ActiveTabChanged();
95 95
96 // Invoked by |browser_| when the active tab is about to be deactivated. 96 // Invoked by |browser_| when the active tab is about to be deactivated.
97 void TabDeactivated(content::WebContents* contents); 97 void TabDeactivated(content::WebContents* contents);
98 98
99 // Invoked by |instant_| or |browser_| to update theme information for NTP. 99 // Invoked by |instant_| or |browser_| to update theme information for NTP.
100 // Set |parse_theme_info| to true to force re-parsing of theme information. 100 // Set |parse_theme_info| to true to force re-parsing of theme information.
101 void UpdateThemeInfo(bool parse_theme_info); 101 void UpdateThemeInfo(bool parse_theme_info);
102 102
103 // Invoked by the InstantController when it wants to open a URL. 103 // Invoked by the InstantController when it wants to open a URL.
104 void OpenURLInCurrentTab(const GURL& url, content::PageTransition transition); 104 void OpenURL(const GURL& url,
105 content::PageTransition transition,
106 WindowOpenDisposition disposition);
105 107
106 // Sets the start and end margins of the omnibox text area. 108 // Sets the start and end margins of the omnibox text area.
107 void SetMarginSize(int start, int end); 109 void SetMarginSize(int start, int end);
108 110
109 private: 111 private:
110 // Sets the value of |instant_| based on value from profile. Invoked 112 // Sets the value of |instant_| based on value from profile. Invoked
111 // on pref change. 113 // on pref change.
112 void ResetInstant(); 114 void ResetInstant();
113 115
114 // Overridden from search::SearchModelObserver: 116 // Overridden from search::SearchModelObserver:
(...skipping 25 matching lines...) Expand all
140 PrefChangeRegistrar profile_pref_registrar_; 142 PrefChangeRegistrar profile_pref_registrar_;
141 143
142 content::NotificationRegistrar registrar_; 144 content::NotificationRegistrar registrar_;
143 145
144 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); 146 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
145 }; 147 };
146 148
147 } // namespace chrome 149 } // namespace chrome
148 150
149 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 151 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/resources/local_omnibox_popup/local_omnibox_popup.js ('k') | chrome/browser/ui/browser_instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698