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

chrome/browser/ui/views/try_chrome_dialog_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
@@ skipping 55 matching lines @@
 
   // Shows a modal dialog asking the user to give chrome another try. See
   // above for the possible outcomes of the function. This is an experimental,
   // non-localized dialog.
   // |flavor| can be 0, 1, 2 or 3 and selects what strings to present.
   // |listener| will be notified when the dialog becomes active and when it is
   // dismissed.
   // Note that the dialog has no parent and it will position itself in a lower
   // corner of the screen. The dialog does not steal focus and does not have an
   // entry in the taskbar.
-  static Result Show(size_t flavor, const ActiveModalDialogListener& listener);
+  static Result Show(size_t flavor,
+                     const ActiveModalDialogListener& listener);
+ private:
+  // Indicates whether the dialog is modal
+  enum DialogType {

[sky, 2017/04/28 21:25:49]

Use enum class. Also, we have moved to kFoo for enums (*SIGH*).

[ananta, 2017/04/28 21:45:22]

Done.

+    MODAL,     // Modal dialog.
+    MODELESS,  // Modeless dialog.
+  };
 
- private:
+  // Indicates the usage type. Chrome or tests.
+  enum UsageType {
+    FOR_CHROME,
+    FOR_TESTING,
+  };
+
+  friend class TryChromeDialogTest;
+
   explicit TryChromeDialogView(size_t flavor);
   ~TryChromeDialogView() override;
 
-  Result ShowModal(const ActiveModalDialogListener& listener);
+  // Helper function to show the dialog.
+  // The |dialog_type| parameter indicates whether the dialog is modal.
+  // The |usage_type| parameter indicates whether this is being invoked by
+  // chrome or a test.
+  Result ShowDialog(const ActiveModalDialogListener& listener,
+                    DialogType dialog_type,
+                    UsageType usage_type);
 
   // Returns a screen rectangle that is fit to show the window. In particular
   // it has the following properties: a) is visible and b) is attached to the
   // bottom of the working area. For LTR machines it returns a left side
   // rectangle and for RTL it returns a right side rectangle so that the dialog
   // does not compete with the standard place of the start menu.
   gfx::Rect ComputeWindowPosition(gfx::Size size, bool is_RTL);
 
   // Create a windows region that looks like a toast of width |w| and height
   // |h|. This is best effort, so we don't care much if the operation fails.
@@ skipping 17 matching lines @@
   views::Widget* popup_;
   views::RadioButton* try_chrome_;
   views::RadioButton* kill_chrome_;
   views::RadioButton* dont_try_chrome_;
   views::Checkbox* make_default_;
   Result result_;
 
   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_