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

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

Issue 1541713002: Revert of Support device scale factor test with popups in LayoutTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/shell/browser/blink_test_controller.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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 #endif 143 #endif
144 bool AddMessageToConsole(WebContents* source, 144 bool AddMessageToConsole(WebContents* source,
145 int32 level, 145 int32 level,
146 const base::string16& message, 146 const base::string16& message,
147 int32 line_no, 147 int32 line_no,
148 const base::string16& source_id) override; 148 const base::string16& source_id) override;
149 void RendererUnresponsive(WebContents* source) override; 149 void RendererUnresponsive(WebContents* source) override;
150 void ActivateContents(WebContents* contents) override; 150 void ActivateContents(WebContents* contents) override;
151 bool HandleContextMenu(const content::ContextMenuParams& params) override; 151 bool HandleContextMenu(const content::ContextMenuParams& params) override;
152 152
153 void SetDeviceScaleFactor(float scale);
154
155 static gfx::Size GetShellDefaultSize(); 153 static gfx::Size GetShellDefaultSize();
156 154
157 private: 155 private:
158 enum UIControl { 156 enum UIControl {
159 BACK_BUTTON, 157 BACK_BUTTON,
160 FORWARD_BUTTON, 158 FORWARD_BUTTON,
161 STOP_BUTTON 159 STOP_BUTTON
162 }; 160 };
163 161
164 class DevToolsWebContentsObserver; 162 class DevToolsWebContentsObserver;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 static base::Callback<void(Shell*)> shell_created_callback_; 253 static base::Callback<void(Shell*)> shell_created_callback_;
256 254
257 // True if the destructur of Shell should post a quit closure on the current 255 // True if the destructur of Shell should post a quit closure on the current
258 // message loop if the destructed Shell object was the last one. 256 // message loop if the destructed Shell object was the last one.
259 static bool quit_message_loop_; 257 static bool quit_message_loop_;
260 }; 258 };
261 259
262 } // namespace content 260 } // namespace content
263 261
264 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 262 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/shell/browser/blink_test_controller.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698