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

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

Issue 11090068: When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updatess Created 8 years, 2 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_SEARCH_SEARCH_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
6 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 6 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "chrome/browser/ui/search/search_model.h" 9 #include "chrome/browser/ui/search/search_model.h"
10 #include "content/public/browser/notification_observer.h" 10 #include "content/public/browser/notification_observer.h"
(...skipping 27 matching lines...) Expand all
38 // Invoked when the OmniboxEditModel changes state in some way that might 38 // Invoked when the OmniboxEditModel changes state in some way that might
39 // affect the search mode. 39 // affect the search mode.
40 void OmniboxEditModelChanged(bool user_input_in_progress, bool cancelling); 40 void OmniboxEditModelChanged(bool user_input_in_progress, bool cancelling);
41 41
42 // Overridden from contents::WebContentsObserver: 42 // Overridden from contents::WebContentsObserver:
43 virtual void NavigateToPendingEntry( 43 virtual void NavigateToPendingEntry(
44 const GURL& url, 44 const GURL& url,
45 content::NavigationController::ReloadType reload_type) OVERRIDE; 45 content::NavigationController::ReloadType reload_type) OVERRIDE;
46 virtual void DidStartProvisionalLoadForFrame( 46 virtual void DidStartProvisionalLoadForFrame(
47 int64 frame_id, 47 int64 frame_id,
48 int64 parent_frame_id,
48 bool is_main_frame, 49 bool is_main_frame,
49 const GURL& validated_url, 50 const GURL& validated_url,
50 bool is_error_page, 51 bool is_error_page,
51 content::RenderViewHost* render_view_host) OVERRIDE; 52 content::RenderViewHost* render_view_host) OVERRIDE;
52 virtual void DocumentLoadedInFrame( 53 virtual void DocumentLoadedInFrame(
53 int64 frame_id, 54 int64 frame_id,
54 content::RenderViewHost* render_view_host) OVERRIDE; 55 content::RenderViewHost* render_view_host) OVERRIDE;
55 56
56 // Overridden from content::NotificationObserver: 57 // Overridden from content::NotificationObserver:
57 virtual void Observe(int type, 58 virtual void Observe(int type,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // See description above NTPLoadState. 118 // See description above NTPLoadState.
118 int64 main_frame_id_; 119 int64 main_frame_id_;
119 120
120 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper); 121 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
121 }; 122 };
122 123
123 } // namespace search 124 } // namespace search
124 } // namespace chrome 125 } // namespace chrome
125 126
126 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 127 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_tab_helper.cc ('k') | chrome/browser/ui/search/search_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698