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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 10038026: TabContents -> WebContentsImpl, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
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_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 // Add and remove observers for page navigation notifications. Adding or 369 // Add and remove observers for page navigation notifications. Adding or
370 // removing multiple times has no effect. The order in which notifications 370 // removing multiple times has no effect. The order in which notifications
371 // are sent to observers is undefined. Clients must be sure to remove the 371 // are sent to observers is undefined. Clients must be sure to remove the
372 // observer before they go away. 372 // observer before they go away.
373 void AddObserver(content::WebContentsObserver* observer); 373 void AddObserver(content::WebContentsObserver* observer);
374 void RemoveObserver(content::WebContentsObserver* observer); 374 void RemoveObserver(content::WebContentsObserver* observer);
375 375
376 private: 376 private:
377 friend class NavigationControllerImpl; 377 friend class NavigationControllerImpl;
378 378
379 FRIEND_TEST_ALL_PREFIXES(TabContentsTest, NoJSMessageOnInterstitials); 379 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, NoJSMessageOnInterstitials);
380 FRIEND_TEST_ALL_PREFIXES(TabContentsTest, UpdateTitle); 380 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, UpdateTitle);
381 FRIEND_TEST_ALL_PREFIXES(TabContentsTest, CrossSiteCantPreemptAfterUnload); 381 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest,
382 CrossSiteCantPreemptAfterUnload);
382 FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles); 383 FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles);
383 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate); 384 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate);
384 FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload); 385 FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload);
385 386
386 // Temporary until the view/contents separation is complete. 387 // Temporary until the view/contents separation is complete.
387 friend class content::WebContentsView; 388 friend class content::WebContentsView;
388 #if defined(TOOLKIT_VIEWS) 389 #if defined(TOOLKIT_VIEWS)
389 friend class TabContentsViewViews; 390 friend class TabContentsViewViews;
390 #elif defined(OS_MACOSX) 391 #elif defined(OS_MACOSX)
391 friend class WebContentsViewMac; 392 friend class WebContentsViewMac;
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 690
690 // Color chooser that was opened by this tab. 691 // Color chooser that was opened by this tab.
691 content::ColorChooser* color_chooser_; 692 content::ColorChooser* color_chooser_;
692 693
693 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 694 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
694 }; 695 };
695 696
696 typedef class WebContentsImpl TabContents; 697 typedef class WebContentsImpl TabContents;
697 698
698 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 699 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698