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

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

Issue 10911189: Fix the warnings when build content/ with clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/android/content_detector.cc ('k') | content/shell/shell_android.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 (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 CONTENT_SHELL_SHELL_H_ 5 #ifndef CONTENT_SHELL_SHELL_H_
6 #define CONTENT_SHELL_SHELL_H_ 6 #define CONTENT_SHELL_SHELL_H_
7 7
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #elif defined(OS_ANDROID) 95 #elif defined(OS_ANDROID)
96 // Registers the Android Java to native methods. 96 // Registers the Android Java to native methods.
97 static bool Register(JNIEnv* env); 97 static bool Register(JNIEnv* env);
98 #endif 98 #endif
99 99
100 // WebContentsDelegate 100 // WebContentsDelegate
101 virtual WebContents* OpenURLFromTab(WebContents* source, 101 virtual WebContents* OpenURLFromTab(WebContents* source,
102 const OpenURLParams& params) OVERRIDE; 102 const OpenURLParams& params) OVERRIDE;
103 virtual void LoadingStateChanged(WebContents* source) OVERRIDE; 103 virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
104 #if defined(OS_ANDROID) 104 #if defined(OS_ANDROID)
105 virtual void LoadProgressChanged(double progress) OVERRIDE; 105 virtual void LoadProgressChanged(WebContents* source,
106 double progress) OVERRIDE;
106 virtual void AttachLayer(WebContents* web_contents, 107 virtual void AttachLayer(WebContents* web_contents,
107 WebKit::WebLayer* layer) OVERRIDE; 108 WebKit::WebLayer* layer) OVERRIDE;
108 virtual void RemoveLayer(WebContents* web_contents, 109 virtual void RemoveLayer(WebContents* web_contents,
109 WebKit::WebLayer* layer) OVERRIDE; 110 WebKit::WebLayer* layer) OVERRIDE;
110 #endif 111 #endif
111 virtual void CloseContents(WebContents* source) OVERRIDE; 112 virtual void CloseContents(WebContents* source) OVERRIDE;
112 virtual void WebContentsCreated(WebContents* source_contents, 113 virtual void WebContentsCreated(WebContents* source_contents,
113 int64 source_frame_id, 114 int64 source_frame_id,
114 const GURL& target_url, 115 const GURL& target_url,
115 WebContents* new_contents) OVERRIDE; 116 WebContents* new_contents) OVERRIDE;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 static base::Callback<void(Shell*)> shell_created_callback_; 234 static base::Callback<void(Shell*)> shell_created_callback_;
234 235
235 // True if the destructur of Shell should post a quit closure on the current 236 // True if the destructur of Shell should post a quit closure on the current
236 // message loop if the destructed Shell object was the last one. 237 // message loop if the destructed Shell object was the last one.
237 static bool quit_message_loop_; 238 static bool quit_message_loop_;
238 }; 239 };
239 240
240 } // namespace content 241 } // namespace content
241 242
242 #endif // CONTENT_SHELL_SHELL_H_ 243 #endif // CONTENT_SHELL_SHELL_H_
OLDNEW
« no previous file with comments | « content/renderer/android/content_detector.cc ('k') | content/shell/shell_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698