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

Side by Side Diff: content/shell/browser/shell.h

Issue 176883012: Set the original url correctly if the frame is loaded via loadData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase correctly Created 6 years, 8 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_ 4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
5 #define CONTENT_SHELL_BROWSER_SHELL_H_ 5 #define CONTENT_SHELL_BROWSER_SHELL_H_
6 6
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class Shell : public WebContentsDelegate, 50 class Shell : public WebContentsDelegate,
51 public WebContentsObserver { 51 public WebContentsObserver {
52 public: 52 public:
53 static const int kDefaultTestWindowWidthDip; 53 static const int kDefaultTestWindowWidthDip;
54 static const int kDefaultTestWindowHeightDip; 54 static const int kDefaultTestWindowHeightDip;
55 55
56 virtual ~Shell(); 56 virtual ~Shell();
57 57
58 void LoadURL(const GURL& url); 58 void LoadURL(const GURL& url);
59 void LoadURLForFrame(const GURL& url, const std::string& frame_name); 59 void LoadURLForFrame(const GURL& url, const std::string& frame_name);
60 void LoadDataWithBaseURL(const GURL& url,
61 const std::string& data,
62 const GURL& base_url);
60 void GoBackOrForward(int offset); 63 void GoBackOrForward(int offset);
61 void Reload(); 64 void Reload();
62 void Stop(); 65 void Stop();
63 void UpdateNavigationControls(bool to_different_document); 66 void UpdateNavigationControls(bool to_different_document);
64 void Close(); 67 void Close();
65 void ShowDevTools(); 68 void ShowDevTools();
66 void ShowDevToolsForElementAt(int x, int y); 69 void ShowDevToolsForElementAt(int x, int y);
67 void ShowDevToolsForTest(const std::string& settings); 70 void ShowDevToolsForTest(const std::string& settings);
68 void CloseDevTools(); 71 void CloseDevTools();
69 #if defined(OS_MACOSX) 72 #if defined(OS_MACOSX)
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 static base::Callback<void(Shell*)> shell_created_callback_; 252 static base::Callback<void(Shell*)> shell_created_callback_;
250 253
251 // True if the destructur of Shell should post a quit closure on the current 254 // True if the destructur of Shell should post a quit closure on the current
252 // message loop if the destructed Shell object was the last one. 255 // message loop if the destructed Shell object was the last one.
253 static bool quit_message_loop_; 256 static bool quit_message_loop_;
254 }; 257 };
255 258
256 } // namespace content 259 } // namespace content
257 260
258 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 261 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698