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

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: address comments and rebase Created 6 years, 9 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
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 class Shell : public WebContentsDelegate, 55 class Shell : public WebContentsDelegate,
56 public WebContentsObserver { 56 public WebContentsObserver {
57 public: 57 public:
58 static const int kDefaultTestWindowWidthDip; 58 static const int kDefaultTestWindowWidthDip;
59 static const int kDefaultTestWindowHeightDip; 59 static const int kDefaultTestWindowHeightDip;
60 60
61 virtual ~Shell(); 61 virtual ~Shell();
62 62
63 void LoadURL(const GURL& url); 63 void LoadURL(const GURL& url);
64 void LoadURLForFrame(const GURL& url, const std::string& frame_name); 64 void LoadURLForFrame(const GURL& url, const std::string& frame_name);
65 void LoadDataWithBaseURL(const GURL& url,
66 const std::string& data,
67 const GURL& base_url);
65 void GoBackOrForward(int offset); 68 void GoBackOrForward(int offset);
66 void Reload(); 69 void Reload();
67 void Stop(); 70 void Stop();
68 void UpdateNavigationControls(); 71 void UpdateNavigationControls();
69 void Close(); 72 void Close();
70 void ShowDevTools(); 73 void ShowDevTools();
71 void ShowDevToolsForElementAt(int x, int y); 74 void ShowDevToolsForElementAt(int x, int y);
72 void ShowDevToolsForTest(const std::string& settings); 75 void ShowDevToolsForTest(const std::string& settings);
73 void CloseDevTools(); 76 void CloseDevTools();
74 #if defined(TOOLKIT_GTK) || defined(OS_MACOSX) 77 #if defined(TOOLKIT_GTK) || defined(OS_MACOSX)
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 static base::Callback<void(Shell*)> shell_created_callback_; 286 static base::Callback<void(Shell*)> shell_created_callback_;
284 287
285 // True if the destructur of Shell should post a quit closure on the current 288 // True if the destructur of Shell should post a quit closure on the current
286 // message loop if the destructed Shell object was the last one. 289 // message loop if the destructed Shell object was the last one.
287 static bool quit_message_loop_; 290 static bool quit_message_loop_;
288 }; 291 };
289 292
290 } // namespace content 293 } // namespace content
291 294
292 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 295 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698