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

Side by Side Diff: chrome/browser/extensions/api/app_window/app_window_api.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 "chrome/browser/extensions/api/app_window/app_window_api.h" 5 #include "chrome/browser/extensions/api/app_window/app_window_api.h"
6 6
7 #include "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/app_window_contents.h" 8 #include "apps/app_window_contents.h"
9 #include "apps/app_window_registry.h" 9 #include "apps/app_window_registry.h"
10 #include "apps/ui/native_app_window.h" 10 #include "apps/ui/native_app_window.h"
(...skipping 17 matching lines...) Expand all
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "extensions/browser/extensions_browser_client.h" 29 #include "extensions/browser/extensions_browser_client.h"
30 #include "extensions/common/switches.h" 30 #include "extensions/common/switches.h"
31 #include "third_party/skia/include/core/SkColor.h" 31 #include "third_party/skia/include/core/SkColor.h"
32 #include "ui/base/ui_base_types.h" 32 #include "ui/base/ui_base_types.h"
33 #include "ui/gfx/rect.h" 33 #include "ui/gfx/rect.h"
34 #include "url/gurl.h" 34 #include "url/gurl.h"
35 35
36 #if defined(USE_ASH) 36 #if defined(USE_ASH)
37 #include "ash/shell.h" 37 #include "ash/shell.h"
38 #include "ui/aura/root_window.h"
39 #include "ui/aura/window.h" 38 #include "ui/aura/window.h"
39 #include "ui/aura/window_event_dispatcher.h"
40 #endif 40 #endif
41 41
42 using apps::AppWindow; 42 using apps::AppWindow;
43 43
44 namespace app_window = extensions::api::app_window; 44 namespace app_window = extensions::api::app_window;
45 namespace Create = app_window::Create; 45 namespace Create = app_window::Create;
46 46
47 namespace extensions { 47 namespace extensions {
48 48
49 namespace app_window_constants { 49 namespace app_window_constants {
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV) { 365 GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV) {
366 // If not on trunk or dev channel, always use the standard white frame. 366 // If not on trunk or dev channel, always use the standard white frame.
367 // TODO(benwells): Remove this code once we get agreement to use the new 367 // TODO(benwells): Remove this code once we get agreement to use the new
368 // native style frame. 368 // native style frame.
369 create_params->has_frame_color = true; 369 create_params->has_frame_color = true;
370 create_params->frame_color = SK_ColorWHITE; 370 create_params->frame_color = SK_ColorWHITE;
371 } 371 }
372 } 372 }
373 373
374 } // namespace extensions 374 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/download/drag_download_item_views.cc ('k') | chrome/browser/extensions/extension_tabs_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698