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

Side by Side Diff: chrome/browser/ui/views/window.cc

Issue 9630002: Ash: Remove compact window mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: OpaqueBrowserFrameView, MultipleWindowIndicatorButton Created 8 years, 9 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/ui/views/window.h" 5 #include "chrome/browser/ui/views/window.h"
6 6
7 #include "ui/views/bubble/bubble_delegate.h" 7 #include "ui/views/bubble/bubble_delegate.h"
8 #include "ui/views/widget/widget.h" 8 #include "ui/views/widget/widget.h"
9 9
10 #if defined(USE_AURA) 10 #if defined(USE_AURA)
(...skipping 28 matching lines...) Expand all
39 39
40 views::Widget* CreateViewsWindowWithParent(gfx::NativeWindow parent, 40 views::Widget* CreateViewsWindowWithParent(gfx::NativeWindow parent,
41 views::WidgetDelegate* delegate) { 41 views::WidgetDelegate* delegate) {
42 views::Widget* widget = new views::Widget; 42 views::Widget* widget = new views::Widget;
43 views::Widget::InitParams params; 43 views::Widget::InitParams params;
44 params.delegate = delegate; 44 params.delegate = delegate;
45 #if defined(OS_WIN) || defined(USE_AURA) 45 #if defined(OS_WIN) || defined(USE_AURA)
46 params.parent = parent; 46 params.parent = parent;
47 #endif 47 #endif
48 #if defined(USE_AURA) 48 #if defined(USE_AURA)
49 // Outside of compact mode, dialog windows may have translucent frames. 49 // Aura dialogs may have translucent frames.
50 // TODO(jamescook): Find a better way to set this. 50 // TODO(jamescook): Find a better way to set this.
51 CommandLine* cmd = CommandLine::ForCurrentProcess(); 51 params.transparent = true;
52 bool compact_window_mode =
53 cmd->HasSwitch(ash::switches::kAuraForceCompactWindowMode) ||
54 cmd->GetSwitchValueASCII(ash::switches::kAuraWindowMode) ==
55 ash::switches::kAuraWindowModeCompact;
56 if (!compact_window_mode)
57 params.transparent = true;
58 #endif 52 #endif
59 widget->Init(params); 53 widget->Init(params);
60 return widget; 54 return widget;
61 } 55 }
62 56
63 } // namespace 57 } // namespace
64 58
65 namespace browser { 59 namespace browser {
66 60
67 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, 61 views::Widget* CreateViewsWindow(gfx::NativeWindow parent,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 params.push_back(1); // Show while screen is locked. 125 params.push_back(1); // Show while screen is locked.
132 chromeos::WmIpc::instance()->SetWindowType( 126 chromeos::WmIpc::instance()->SetWindowType(
133 bubble_widget->GetNativeView(), 127 bubble_widget->GetNativeView(),
134 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, 128 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
135 &params); 129 &params);
136 #endif 130 #endif
137 return bubble_widget; 131 return bubble_widget;
138 } 132 }
139 133
140 } // namespace browser 134 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/default_tab_drag_controller.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698