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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.h

Issue 150132: First cut at popup blocking for Mac. Remove ifdefs in cross-platform code. Im... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <map> 10 #include <map>
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 BlockedPopupContainer* blocked_popup_container() const { 564 BlockedPopupContainer* blocked_popup_container() const {
565 return blocked_popups_; 565 return blocked_popups_;
566 } 566 }
567 567
568 private: 568 private:
569 friend class NavigationController; 569 friend class NavigationController;
570 // Used to access the child_windows_ (ConstrainedWindowList) for testing 570 // Used to access the child_windows_ (ConstrainedWindowList) for testing
571 // automation purposes. 571 // automation purposes.
572 friend class AutomationProvider; 572 friend class AutomationProvider;
573 friend class BlockedPopupContainerTest; 573 friend class BlockedPopupContainerTest;
574 friend class BlockedPopupContainerControllerTest;
574 575
575 FRIEND_TEST(TabContentsTest, UpdateTitle); 576 FRIEND_TEST(TabContentsTest, UpdateTitle);
576 FRIEND_TEST(BlockedPopupContainerTest, TestReposition); 577 FRIEND_TEST(BlockedPopupContainerTest, TestReposition);
577 578
578 // Temporary until the view/contents separation is complete. 579 // Temporary until the view/contents separation is complete.
579 friend class TabContentsView; 580 friend class TabContentsView;
580 #if defined(OS_WIN) 581 #if defined(OS_WIN)
581 friend class TabContentsViewWin; 582 friend class TabContentsViewWin;
582 #elif defined(OS_MACOSX) 583 #elif defined(OS_MACOSX)
583 friend class TabContentsViewMac; 584 friend class TabContentsViewMac;
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 // True if the user has decided to block future javascript messages. This is 1071 // True if the user has decided to block future javascript messages. This is
1071 // reset on navigations to false on navigations. 1072 // reset on navigations to false on navigations.
1072 bool suppress_javascript_messages_; 1073 bool suppress_javascript_messages_;
1073 1074
1074 // --------------------------------------------------------------------------- 1075 // ---------------------------------------------------------------------------
1075 1076
1076 DISALLOW_COPY_AND_ASSIGN(TabContents); 1077 DISALLOW_COPY_AND_ASSIGN(TabContents);
1077 }; 1078 };
1078 1079
1079 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1080 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698