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

Side by Side Diff: chrome/browser/ui/webui/options/options_ui.h

Issue 2541063002: Revert of Remove about:srcdoc url conversion. (Closed)
Patch Set: Created 4 years 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
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_WEBUI_OPTIONS_OPTIONS_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Takes the suggestions from |result| and adds them to |suggestions| so that 125 // Takes the suggestions from |result| and adds them to |suggestions| so that
126 // they can be passed to a JavaScript function. 126 // they can be passed to a JavaScript function.
127 static void ProcessAutocompleteSuggestions( 127 static void ProcessAutocompleteSuggestions(
128 const AutocompleteResult& result, 128 const AutocompleteResult& result,
129 base::ListValue* const suggestions); 129 base::ListValue* const suggestions);
130 130
131 // Overridden from content::WebContentsObserver: 131 // Overridden from content::WebContentsObserver:
132 void DidStartProvisionalLoadForFrame( 132 void DidStartProvisionalLoadForFrame(
133 content::RenderFrameHost* render_frame_host, 133 content::RenderFrameHost* render_frame_host,
134 const GURL& validated_url, 134 const GURL& validated_url,
135 bool is_error_page) override; 135 bool is_error_page,
136 bool is_iframe_srcdoc) override;
136 void DocumentLoadedInFrame( 137 void DocumentLoadedInFrame(
137 content::RenderFrameHost *render_frame_host) override; 138 content::RenderFrameHost *render_frame_host) override;
138 void DocumentOnLoadCompletedInMainFrame() override; 139 void DocumentOnLoadCompletedInMainFrame() override;
139 140
140 // Overridden from OptionsPageUIHandlerHost: 141 // Overridden from OptionsPageUIHandlerHost:
141 void InitializeHandlers() override; 142 void InitializeHandlers() override;
142 void OnFinishedLoading() override; 143 void OnFinishedLoading() override;
143 144
144 private: 145 private:
145 // Adds OptionsPageUiHandler to the handlers list if handler is enabled. 146 // Adds OptionsPageUiHandler to the handlers list if handler is enabled.
(...skipping 11 matching lines...) Expand all
157 #endif 158 #endif
158 159
159 base::Time load_start_time_; 160 base::Time load_start_time_;
160 161
161 DISALLOW_COPY_AND_ASSIGN(OptionsUI); 162 DISALLOW_COPY_AND_ASSIGN(OptionsUI);
162 }; 163 };
163 164
164 } // namespace options 165 } // namespace options
165 166
166 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_ 167 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extensions_ui.cc ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698