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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 479933003: Move NativeAppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 153 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
154 #include "chrome/browser/profiles/profile_manager.h" 154 #include "chrome/browser/profiles/profile_manager.h"
155 #include "chrome/browser/ui/ash/screenshot_taker.h" 155 #include "chrome/browser/ui/ash/screenshot_taker.h"
156 #include "chromeos/audio/cras_audio_handler.h" 156 #include "chromeos/audio/cras_audio_handler.h"
157 #include "ui/keyboard/keyboard_util.h" 157 #include "ui/keyboard/keyboard_util.h"
158 #endif 158 #endif
159 159
160 #if !defined(OS_MACOSX) 160 #if !defined(OS_MACOSX)
161 #include "apps/app_window.h" 161 #include "apps/app_window.h"
162 #include "apps/app_window_registry.h" 162 #include "apps/app_window_registry.h"
163 #include "apps/ui/native_app_window.h"
164 #include "base/basictypes.h" 163 #include "base/basictypes.h"
165 #include "base/compiler_specific.h" 164 #include "base/compiler_specific.h"
166 #include "chrome/browser/ui/extensions/application_launch.h" 165 #include "chrome/browser/ui/extensions/application_launch.h"
166 #include "extensions/browser/app_window/native_app_window.h"
167 #include "ui/base/window_open_disposition.h" 167 #include "ui/base/window_open_disposition.h"
168 #endif 168 #endif
169 169
170 using content::BrowserThread; 170 using content::BrowserThread;
171 using content::URLRequestMockHTTPJob; 171 using content::URLRequestMockHTTPJob;
172 using testing::Mock; 172 using testing::Mock;
173 using testing::Return; 173 using testing::Return;
174 using testing::_; 174 using testing::_;
175 175
176 namespace policy { 176 namespace policy {
(...skipping 3036 matching lines...) Expand 10 before | Expand all | Expand 10 after
3213 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 3213 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
3214 browser2->tab_strip_model()->GetActiveWebContents(), 3214 browser2->tab_strip_model()->GetActiveWebContents(),
3215 "domAutomationController.send(window.showModalDialog !== undefined);", 3215 "domAutomationController.send(window.showModalDialog !== undefined);",
3216 &result)); 3216 &result));
3217 EXPECT_TRUE(result); 3217 EXPECT_TRUE(result);
3218 } 3218 }
3219 3219
3220 #endif // !defined(CHROME_OS) 3220 #endif // !defined(CHROME_OS)
3221 3221
3222 } // namespace policy 3222 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/ash_panel_contents.cc ('k') | chrome/browser/ui/apps/chrome_apps_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698