summaryrefslogtreecommitdiffstats
path: root/chrome/test/base/in_process_browser_test.h
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 16:54:39 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 16:54:39 +0000
commitfc44f246aec4d85533d2f90c97dfd01896f391a4 (patch)
treec86cfeb29d92c100db77eae1f1951bc4713e4241 /chrome/test/base/in_process_browser_test.h
parentda8cb193edebc8dc78a422df2633340e6a606cde (diff)
downloadchromium_src-fc44f246aec4d85533d2f90c97dfd01896f391a4.zip
chromium_src-fc44f246aec4d85533d2f90c97dfd01896f391a4.tar.gz
chromium_src-fc44f246aec4d85533d2f90c97dfd01896f391a4.tar.bz2
Cocoa: Handle re-open event in app mode
Currently when the Chrome icon is clicked with no windows open we always open a new browser window. This is incorrect in app mode. In app mode we should instead open an app window. To fix this I changed the reopen handler to call BrowserInit::LaunchBrowser() which does the correct thing depending on the current mode. BUG=112651 TEST= Review URL: http://codereview.chromium.org/9383040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/in_process_browser_test.h')
-rw-r--r--chrome/test/base/in_process_browser_test.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 2cc2c97..8b5df11 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -155,6 +155,9 @@ class InProcessBrowserTest : public BrowserTestBase {
// Sets some test states (see below for comments). Call this in your test
// constructor.
void set_show_window(bool show) { show_window_ = show; }
+ void set_initial_window_required(bool flag) {
+ initial_window_required_= flag;
+ }
void EnableDOMAutomation() { dom_automation_enabled_ = true; }
void EnableTabCloseableStateWatcher() {
tab_closeable_state_watcher_enabled_ = true;
@@ -185,6 +188,9 @@ class InProcessBrowserTest : public BrowserTestBase {
// tests for example need the windows shown).
bool show_window_;
+ // Whether this test requires an initial window.
+ bool initial_window_required_;
+
// Whether the JavaScript can access the DOMAutomationController (a JS object
// that can send messages back to the browser).
bool dom_automation_enabled_;