chrome: Move Sad Tab out of chrome namespace.

From discussion on chromium-dev, it was decided to remove 'chrome'
namespace.

Bug: 289619
Change-Id: I7e424529d4dacd61e8c272f8c4261546db55407a
Reviewed-on: https://chromium-review.googlesource.com/768469
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517046}

chrome/browser/ui/bookmarks/bookmark_tab_helper.cc

@@ -49,7 +49,7 @@ bool BookmarkTabHelper::ShouldShowBookmarkBar() const {
   if (web_contents()->ShowingInterstitialPage())
     return false;
 
-  if (chrome::SadTab::ShouldShow(web_contents()->GetCrashedStatus()))
+  if (SadTab::ShouldShow(web_contents()->GetCrashedStatus()))
     return false;
 
   if (!browser_defaults::bookmarks_enabled)
@@ -85,8 +85,9 @@ BookmarkTabHelper::BookmarkTabHelper(content::WebContents* web_contents)
 
 void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
   const bool old_state = is_starred_;
-  is_starred_ = (bookmark_model_ &&
-      bookmark_model_->IsBookmarked(chrome::GetURLToBookmark(web_contents())));
+  is_starred_ =
+      (bookmark_model_ &&
+       bookmark_model_->IsBookmarked(chrome::GetURLToBookmark(web_contents())));
 
   if (is_starred_ != old_state && delegate_)
     delegate_->URLStarredChanged(web_contents(), is_starred_);

chrome/browser/ui/cocoa/tab_contents/sad_tab_mac.mm

@@ -8,9 +8,9 @@
 
 namespace {
 
-class SadTabCocoa : public chrome::SadTab {
+class SadTabCocoa : public SadTab {
  public:
-  SadTabCocoa(content::WebContents* web_contents, chrome::SadTabKind kind)
+  SadTabCocoa(content::WebContents* web_contents, SadTabKind kind)
       : SadTab(web_contents, kind) {
     NSView* web_contents_view = web_contents->GetNativeView();
     sad_tab_view_ =
@@ -28,7 +28,6 @@ class SadTabCocoa : public chrome::SadTab {
 
 }  // namespace
 
-chrome::SadTab* chrome::SadTab::Create(content::WebContents* web_contents,
-                                       SadTabKind kind) {
+SadTab* SadTab::Create(content::WebContents* web_contents, SadTabKind kind) {
   return new SadTabCocoa(web_contents, kind);
 }

chrome/browser/ui/cocoa/tab_contents/sad_tab_mac_unittest.mm

@@ -37,12 +37,11 @@ class SadTabViewTest : public CocoaTest {
 TEST_VIEW(SadTabViewTest, view_);
 
 TEST(SadTabViewBehaviorTest, ClickOnLinks) {
-  using chrome::SadTab;
   using Action = SadTab::Action;
 
-  class MockSadTab : public chrome::SadTab {
+  class MockSadTab : public SadTab {
    public:
-    MockSadTab() : SadTab(nullptr, chrome::SAD_TAB_KIND_CRASHED) {}
+    MockSadTab() : SadTab(nullptr, SAD_TAB_KIND_CRASHED) {}
     MOCK_METHOD0(RecordFirstPaint, void());
     MOCK_METHOD1(PerformAction, void(Action));
   };

chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h

@@ -12,7 +12,7 @@
 // A view that displays the "sad tab" (aka crash page).
 @interface SadTabView : NSView
 
-- (instancetype)initWithFrame:(NSRect)frame sadTab:(chrome::SadTab*)sadTab;
+- (instancetype)initWithFrame:(NSRect)frame sadTab:(SadTab*)sadTab;
 
 @end
 

chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm

@@ -51,10 +51,10 @@ const CGFloat kMaxTopMargin = 130;
   NSTextView* message_;
   HyperlinkTextView* help_;
   NSButton* button_;
-  chrome::SadTab* sadTab_;
+  SadTab* sadTab_;
 }
 
-- (instancetype)initWithFrame:(NSRect)frame sadTab:(chrome::SadTab*)sadTab {
+- (instancetype)initWithFrame:(NSRect)frame sadTab:(SadTab*)sadTab {
   if ((self = [super initWithFrame:frame])) {
     sadTab_ = sadTab;
 
@@ -216,14 +216,14 @@ const CGFloat kMaxTopMargin = 130;
 }
 
 - (void)buttonClicked {
-  sadTab_->PerformAction(chrome::SadTab::Action::BUTTON);
+  sadTab_->PerformAction(SadTab::Action::BUTTON);
 }
 
 // Called when someone clicks on the embedded link.
 - (BOOL)textView:(NSTextView*)textView
     clickedOnLink:(id)link
           atIndex:(NSUInteger)charIndex {
-  sadTab_->PerformAction(chrome::SadTab::Action::HELP_LINK);
+  sadTab_->PerformAction(SadTab::Action::HELP_LINK);
   return YES;
 }
 

chrome/browser/ui/sad_tab.cc

@@ -84,8 +84,6 @@ bool AreOtherTabsOpen() {
 
 }  // namespace
 
-namespace chrome {
-
 // static
 bool SadTab::ShouldShow(base::TerminationStatus status) {
   switch (status) {
@@ -115,15 +113,15 @@ int SadTab::GetTitle() {
     return IDS_SAD_TAB_TITLE;
   switch (kind_) {
 #if defined(OS_CHROMEOS)
-    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+    case SAD_TAB_KIND_KILLED_BY_OOM:
       return IDS_SAD_TAB_RELOAD_TITLE;
 #endif
-    case chrome::SAD_TAB_KIND_OOM:
+    case SAD_TAB_KIND_OOM:
 #if defined(OS_WIN)  // Only Windows has OOM sad tab strings.
       return IDS_SAD_TAB_OOM_TITLE;
 #endif
-    case chrome::SAD_TAB_KIND_CRASHED:
-    case chrome::SAD_TAB_KIND_KILLED:
+    case SAD_TAB_KIND_CRASHED:
+    case SAD_TAB_KIND_KILLED:
       return IDS_SAD_TAB_RELOAD_TITLE;
   }
   NOTREACHED();
@@ -133,16 +131,16 @@ int SadTab::GetTitle() {
 int SadTab::GetMessage() {
   switch (kind_) {
 #if defined(OS_CHROMEOS)
-    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+    case SAD_TAB_KIND_KILLED_BY_OOM:
       return IDS_KILLED_TAB_BY_OOM_MESSAGE;
 #endif
-    case chrome::SAD_TAB_KIND_OOM:
+    case SAD_TAB_KIND_OOM:
       if (show_feedback_button_)
         return AreOtherTabsOpen() ? IDS_SAD_TAB_OOM_MESSAGE_TABS
                                   : IDS_SAD_TAB_OOM_MESSAGE_NOTABS;
       return IDS_SAD_TAB_MESSAGE;
-    case chrome::SAD_TAB_KIND_CRASHED:
-    case chrome::SAD_TAB_KIND_KILLED:
+    case SAD_TAB_KIND_CRASHED:
+    case SAD_TAB_KIND_KILLED:
       return show_feedback_button_ ? IDS_SAD_TAB_RELOAD_TRY
                                    : IDS_SAD_TAB_MESSAGE;
   }
@@ -170,13 +168,13 @@ std::vector<int> SadTab::GetSubMessages() {
 
   switch (kind_) {
 #if defined(OS_CHROMEOS)
-    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+    case SAD_TAB_KIND_KILLED_BY_OOM:
       return std::vector<int>();
 #endif
-    case chrome::SAD_TAB_KIND_OOM:
+    case SAD_TAB_KIND_OOM:
       return std::vector<int>();
-    case chrome::SAD_TAB_KIND_CRASHED:
-    case chrome::SAD_TAB_KIND_KILLED:
+    case SAD_TAB_KIND_CRASHED:
+    case SAD_TAB_KIND_KILLED:
       std::vector<int> message_ids = {IDS_SAD_TAB_RELOAD_RESTART_BROWSER,
                                       IDS_SAD_TAB_RELOAD_RESTART_DEVICE};
       // Only show incognito suggestion if not already in Incognito mode.
@@ -201,18 +199,18 @@ void SadTab::RecordFirstPaint() {
   recorded_paint_ = true;
 
   switch (kind_) {
-    case chrome::SAD_TAB_KIND_CRASHED:
+    case SAD_TAB_KIND_CRASHED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.CrashDisplayed");
       break;
-    case chrome::SAD_TAB_KIND_OOM:
+    case SAD_TAB_KIND_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.OomDisplayed");
       break;
 #if defined(OS_CHROMEOS)
-    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+    case SAD_TAB_KIND_KILLED_BY_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.KillDisplayed.OOM");
 #endif
     // Fallthrough
-    case chrome::SAD_TAB_KIND_KILLED:
+    case SAD_TAB_KIND_KILLED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.KillDisplayed");
       break;
   }
@@ -228,8 +226,8 @@ void SadTab::PerformAction(SadTab::Action action) {
                   ui_metrics::SadTabEvent::BUTTON_CLICKED);
       if (show_feedback_button_) {
         ShowFeedbackPage(
-            FindBrowserWithWebContents(web_contents_),
-            kFeedbackSourceSadTabPage,
+            chrome::FindBrowserWithWebContents(web_contents_),
+            chrome::kFeedbackSourceSadTabPage,
             l10n_util::GetStringUTF8(kind_ == SAD_TAB_KIND_CRASHED
                                          ? IDS_CRASHED_TAB_FEEDBACK_MESSAGE
                                          : IDS_KILLED_TAB_FEEDBACK_MESSAGE),
@@ -256,14 +254,14 @@ SadTab::SadTab(content::WebContents* web_contents, SadTabKind kind)
       show_feedback_button_(ShouldShowFeedbackButton()),
       recorded_paint_(false) {
   switch (kind) {
-    case chrome::SAD_TAB_KIND_CRASHED:
+    case SAD_TAB_KIND_CRASHED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.CrashCreated");
       break;
-    case chrome::SAD_TAB_KIND_OOM:
+    case SAD_TAB_KIND_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.OomCreated");
       break;
 #if defined(OS_CHROMEOS)
-    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+    case SAD_TAB_KIND_KILLED_BY_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.KillCreated.OOM");
       {
         const std::string spec = web_contents->GetURL().GetOrigin().spec();
@@ -272,12 +270,10 @@ SadTab::SadTab(content::WebContents* web_contents, SadTabKind kind)
       }
 #endif
     // Fall through
-    case chrome::SAD_TAB_KIND_KILLED:
+    case SAD_TAB_KIND_KILLED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.KillCreated");
       LOG(WARNING) << "Tab Killed: "
                    << web_contents->GetURL().GetOrigin().spec();
       break;
   }
 }
-
-}  // namespace chrome

chrome/browser/ui/sad_tab.h

@@ -14,8 +14,6 @@ namespace content {
 class WebContents;
 }
 
-namespace chrome {
-
 // Cross-platform interface to show the Sad tab UI.
 class SadTab {
  public:
@@ -64,6 +62,4 @@ class SadTab {
   DISALLOW_COPY_AND_ASSIGN(SadTab);
 };
 
-}  // namespace chrome
-
 #endif  // CHROME_BROWSER_UI_SAD_TAB_H_

chrome/browser/ui/sad_tab_helper.cc

@@ -14,20 +14,19 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(SadTabHelper);
 
 namespace {
 
-chrome::SadTabKind SadTabKindFromTerminationStatus(
-    base::TerminationStatus status) {
+SadTabKind SadTabKindFromTerminationStatus(base::TerminationStatus status) {
   switch (status) {
 #if defined(OS_CHROMEOS)
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
-      return chrome::SAD_TAB_KIND_KILLED_BY_OOM;
+      return SAD_TAB_KIND_KILLED_BY_OOM;
 #endif
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
     case base::TERMINATION_STATUS_LAUNCH_FAILED:
-      return chrome::SAD_TAB_KIND_KILLED;
+      return SAD_TAB_KIND_KILLED;
     case base::TERMINATION_STATUS_OOM:
-      return chrome::SAD_TAB_KIND_OOM;
+      return SAD_TAB_KIND_OOM;
     default:
-      return chrome::SAD_TAB_KIND_CRASHED;
+      return SAD_TAB_KIND_CRASHED;
   }
 }
 
@@ -54,11 +53,11 @@ void SadTabHelper::RenderProcessGone(base::TerminationStatus status) {
   if (sad_tab_)
     return;
 
-  if (chrome::SadTab::ShouldShow(status))
+  if (SadTab::ShouldShow(status))
     InstallSadTab(status);
 }
 
 void SadTabHelper::InstallSadTab(base::TerminationStatus status) {
-  sad_tab_.reset(chrome::SadTab::Create(
-      web_contents(), SadTabKindFromTerminationStatus(status)));
+  sad_tab_.reset(
+      SadTab::Create(web_contents(), SadTabKindFromTerminationStatus(status)));
 }

chrome/browser/ui/sad_tab_helper.h

@@ -12,9 +12,7 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
-namespace chrome {
 class SadTab;
-}
 
 // Per-tab class to manage sad tab views.
 class SadTabHelper : public content::WebContentsObserver,
@@ -22,7 +20,7 @@ class SadTabHelper : public content::WebContentsObserver,
  public:
   ~SadTabHelper() override;
 
-  chrome::SadTab* sad_tab() { return sad_tab_.get(); }
+  SadTab* sad_tab() { return sad_tab_.get(); }
 
  private:
   friend class content::WebContentsUserData<SadTabHelper>;
@@ -35,7 +33,7 @@ class SadTabHelper : public content::WebContentsObserver,
   void RenderViewReady() override;
   void RenderProcessGone(base::TerminationStatus status) override;
 
-  std::unique_ptr<chrome::SadTab> sad_tab_;
+  std::unique_ptr<SadTab> sad_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(SadTabHelper);
 };

chrome/browser/ui/sad_tab_types.h

@@ -7,8 +7,6 @@
 
 #include "build/build_config.h"
 
-namespace chrome {
-
 enum SadTabKind {
   SAD_TAB_KIND_CRASHED,        // Tab crashed.
 #if defined(OS_CHROMEOS)
@@ -18,6 +16,4 @@ enum SadTabKind {
   SAD_TAB_KIND_KILLED          // Tab killed.
 };
 
-}  // namespace chrome
-
 #endif  // CHROME_BROWSER_UI_SAD_TAB_TYPES_H_

chrome/browser/ui/views/sad_tab_view.cc

@@ -47,8 +47,7 @@ views::Label* CreateFormattedLabel(const base::string16& message) {
 
 }  // namespace
 
-SadTabView::SadTabView(content::WebContents* web_contents,
-                       chrome::SadTabKind kind)
+SadTabView::SadTabView(content::WebContents* web_contents, SadTabKind kind)
     : SadTab(web_contents, kind) {
   SetBackground(views::CreateThemedSolidBackground(
       this, ui::NativeTheme::kColorId_DialogBackground));
@@ -174,11 +173,7 @@ void SadTabView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 }
 
-namespace chrome {
-
 SadTab* SadTab::Create(content::WebContents* web_contents,
                        SadTabKind kind) {
   return new SadTabView(web_contents, kind);
 }
-
-}  // namespace chrome

chrome/browser/ui/views/sad_tab_view.h

@@ -29,12 +29,12 @@ class LabelButton;
 //  "sad tab" in the browser window when a renderer is destroyed unnaturally.
 //
 ///////////////////////////////////////////////////////////////////////////////
-class SadTabView : public chrome::SadTab,
+class SadTabView : public SadTab,
                    public views::View,
                    public views::LinkListener,
                    public views::ButtonListener {
  public:
-  SadTabView(content::WebContents* web_contents, chrome::SadTabKind kind);
+  SadTabView(content::WebContents* web_contents, SadTabKind kind);
   ~SadTabView() override;
 
   // Overridden from views::View: