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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/app/shell_breakpad_client.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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 virtual void DidNavigateMainFramePostCommit( 135 virtual void DidNavigateMainFramePostCommit(
136 WebContents* web_contents) OVERRIDE; 136 WebContents* web_contents) OVERRIDE;
137 virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE; 137 virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
138 #if defined(OS_MACOSX) 138 #if defined(OS_MACOSX)
139 virtual void HandleKeyboardEvent( 139 virtual void HandleKeyboardEvent(
140 WebContents* source, 140 WebContents* source,
141 const NativeWebKeyboardEvent& event) OVERRIDE; 141 const NativeWebKeyboardEvent& event) OVERRIDE;
142 #endif 142 #endif
143 virtual bool AddMessageToConsole(WebContents* source, 143 virtual bool AddMessageToConsole(WebContents* source,
144 int32 level, 144 int32 level,
145 const string16& message, 145 const base::string16& message,
146 int32 line_no, 146 int32 line_no,
147 const string16& source_id) OVERRIDE; 147 const base::string16& source_id) OVERRIDE;
148 virtual void RendererUnresponsive(WebContents* source) OVERRIDE; 148 virtual void RendererUnresponsive(WebContents* source) OVERRIDE;
149 virtual void ActivateContents(WebContents* contents) OVERRIDE; 149 virtual void ActivateContents(WebContents* contents) OVERRIDE;
150 virtual void DeactivateContents(WebContents* contents) OVERRIDE; 150 virtual void DeactivateContents(WebContents* contents) OVERRIDE;
151 virtual void WorkerCrashed(WebContents* source) OVERRIDE; 151 virtual void WorkerCrashed(WebContents* source) OVERRIDE;
152 152
153 private: 153 private:
154 enum UIControl { 154 enum UIControl {
155 BACK_BUTTON, 155 BACK_BUTTON,
156 FORWARD_BUTTON, 156 FORWARD_BUTTON,
157 STOP_BUTTON 157 STOP_BUTTON
(...skipping 26 matching lines...) Expand all
184 void PlatformSetContents(); 184 void PlatformSetContents();
185 // Resize the content area and GUI. 185 // Resize the content area and GUI.
186 void PlatformResizeSubViews(); 186 void PlatformResizeSubViews();
187 // Enable/disable a button. 187 // Enable/disable a button.
188 void PlatformEnableUIControl(UIControl control, bool is_enabled); 188 void PlatformEnableUIControl(UIControl control, bool is_enabled);
189 // Updates the url in the url bar. 189 // Updates the url in the url bar.
190 void PlatformSetAddressBarURL(const GURL& url); 190 void PlatformSetAddressBarURL(const GURL& url);
191 // Sets whether the spinner is spinning. 191 // Sets whether the spinner is spinning.
192 void PlatformSetIsLoading(bool loading); 192 void PlatformSetIsLoading(bool loading);
193 // Set the title of shell window 193 // Set the title of shell window
194 void PlatformSetTitle(const string16& title); 194 void PlatformSetTitle(const base::string16& title);
195 #if defined(OS_ANDROID) 195 #if defined(OS_ANDROID)
196 void PlatformToggleFullscreenModeForTab(WebContents* web_contents, 196 void PlatformToggleFullscreenModeForTab(WebContents* web_contents,
197 bool enter_fullscreen); 197 bool enter_fullscreen);
198 bool PlatformIsFullscreenForTabOrPending( 198 bool PlatformIsFullscreenForTabOrPending(
199 const WebContents* web_contents) const; 199 const WebContents* web_contents) const;
200 #endif 200 #endif
201 201
202 gfx::NativeView GetContentView(); 202 gfx::NativeView GetContentView();
203 203
204 // WebContentsObserver 204 // WebContentsObserver
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 static base::Callback<void(Shell*)> shell_created_callback_; 281 static base::Callback<void(Shell*)> shell_created_callback_;
282 282
283 // True if the destructur of Shell should post a quit closure on the current 283 // True if the destructur of Shell should post a quit closure on the current
284 // message loop if the destructed Shell object was the last one. 284 // message loop if the destructed Shell object was the last one.
285 static bool quit_message_loop_; 285 static bool quit_message_loop_;
286 }; 286 };
287 287
288 } // namespace content 288 } // namespace content
289 289
290 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 290 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/shell/app/shell_breakpad_client.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698