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

Side by Side Diff: ui/aura_shell/desktop_background_view.cc

Issue 8585007: Added hotkey support to 8508009 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for try bots Created 9 years 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
« no previous file with comments | « ui/aura/window.cc ('k') | ui/aura_shell/examples/lock_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/desktop_background_view.h" 5 #include "ui/aura_shell/desktop_background_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "ui/aura/desktop.h" 9 #include "ui/aura/desktop.h"
10 #include "ui/aura_shell/aura_shell_export.h" 10 #include "ui/aura_shell/aura_shell_export.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 views::Widget::InitParams params( 48 views::Widget::InitParams params(
49 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 49 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
50 DesktopBackgroundView* view = new DesktopBackgroundView; 50 DesktopBackgroundView* view = new DesktopBackgroundView;
51 params.delegate = view; 51 params.delegate = view;
52 desktop_widget->Init(params); 52 desktop_widget->Init(params);
53 Shell::GetInstance()->GetContainer( 53 Shell::GetInstance()->GetContainer(
54 aura_shell::internal::kShellWindowId_DesktopBackgroundContainer)-> 54 aura_shell::internal::kShellWindowId_DesktopBackgroundContainer)->
55 AddChild(desktop_widget->GetNativeView()); 55 AddChild(desktop_widget->GetNativeView());
56 desktop_widget->SetContentsView(view); 56 desktop_widget->SetContentsView(view);
57 desktop_widget->Show(); 57 desktop_widget->Show();
58 desktop_widget->GetNativeView()->set_name("DesktopBackgroundView"); 58 desktop_widget->GetNativeView()->SetName("DesktopBackgroundView");
59 return desktop_widget; 59 return desktop_widget;
60 } 60 }
61 61
62 } // namespace internal 62 } // namespace internal
63 } // namespace aura_shell 63 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura/window.cc ('k') | ui/aura_shell/examples/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698