chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge to master Created 6 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/wm/workspace_controller_unittest.cc ('k') | content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index 5e252af27b360bc0916c854073c44ce7d9c3ee95..634ff70848ceb918014e4e13c6e084fce9172157 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -664,7 +664,7 @@ scoped_ptr<TestBrowserWindowAura> CreateTestBrowserWindow(

aura::Window* window = new aura::Window(NULL);

window->set_id(0);

window->SetType(ui::wm::WINDOW_TYPE_NORMAL);

- window->Init(ui::LAYER_TEXTURED);

+ window->Init(aura::WINDOW_LAYER_TEXTURED);

window->Show();

scoped_ptr<TestBrowserWindowAura> browser_window(

@@ -730,7 +730,7 @@ class V1App : public TestBrowserWindow {

native_window_.reset(new aura::Window(NULL));

native_window_->set_id(0);

native_window_->SetType(ui::wm::WINDOW_TYPE_POPUP);

- native_window_->Init(ui::LAYER_TEXTURED);

+ native_window_->Init(aura::WINDOW_LAYER_TEXTURED);

native_window_->Show();

Browser::CreateParams params = Browser::CreateParams::CreateForApp(