Description: Replace layout constants in chrome/browser/extensions and chrome/browser/first_run

chrome/browser/ui/views/try_chrome_dialog_view.h

Index: chrome/browser/ui/views/try_chrome_dialog_view.h
diff --git a/chrome/browser/first_run/try_chrome_dialog_view.h b/chrome/browser/ui/views/try_chrome_dialog_view.h
similarity index 95%
rename from chrome/browser/first_run/try_chrome_dialog_view.h
rename to chrome/browser/ui/views/try_chrome_dialog_view.h
index 897b73dbd6bb8b60c7faff2e248597cb698a5c13..a808d34e646dfc8400a6937c6ce1eea11ffdd17e 100644
--- a/chrome/browser/first_run/try_chrome_dialog_view.h
+++ b/chrome/browser/ui/views/try_chrome_dialog_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_FIRST_RUN_TRY_CHROME_DIALOG_VIEW_H_
-#define CHROME_BROWSER_FIRST_RUN_TRY_CHROME_DIALOG_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_VIEW_H_
 
 #include <stddef.h>
 
@@ -108,6 +108,8 @@ class TryChromeDialogView : public views::ButtonListener,
   // by some convoluted logic should not be chrome.
   void LinkClicked(views::Link* source, int event_flags) override;
 
+  friend class TryChromeDialogTest;

[Peter Kasting, 2017/04/28 06:16:41]

Nit: Friend declarations typically go at the top of the section

[ananta, 2017/04/28 14:57:01]

no longer needed with the force parameter.

+
   // Controls which flavor of the heading text to use.
   size_t flavor_;
 
@@ -119,8 +121,9 @@ class TryChromeDialogView : public views::ButtonListener,
   views::RadioButton* dont_try_chrome_;
   views::Checkbox* make_default_;
   Result result_;
+  static bool for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialogView);
 };
 
-#endif  // CHROME_BROWSER_FIRST_RUN_TRY_CHROME_DIALOG_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_VIEW_H_