Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/apps/chrome_native_app_window_views.h" | 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "apps/ui/views/app_window_frame_view.h" | 10 #include "apps/ui/views/app_window_frame_view.h" |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 223 using BoundsSpecification = AppWindow::BoundsSpecification; | 223 using BoundsSpecification = AppWindow::BoundsSpecification; |
| 224 bool position_specified = | 224 bool position_specified = |
| 225 initial_window_bounds.x() != BoundsSpecification::kUnspecifiedPosition && | 225 initial_window_bounds.x() != BoundsSpecification::kUnspecifiedPosition && |
| 226 initial_window_bounds.y() != BoundsSpecification::kUnspecifiedPosition; | 226 initial_window_bounds.y() != BoundsSpecification::kUnspecifiedPosition; |
| 227 params.bounds = (use_default_bounds || !position_specified) ? | 227 params.bounds = (use_default_bounds || !position_specified) ? |
| 228 gfx::Rect(preferred_size_) : | 228 gfx::Rect(preferred_size_) : |
| 229 gfx::Rect(initial_window_bounds.origin(), preferred_size_); | 229 gfx::Rect(initial_window_bounds.origin(), preferred_size_); |
| 230 OnBeforePanelWidgetInit(use_default_bounds, ¶ms, widget()); | 230 OnBeforePanelWidgetInit(use_default_bounds, ¶ms, widget()); |
| 231 widget()->Init(params); | 231 widget()->Init(params); |
| 232 widget()->set_focus_on_creation(create_params.focused); | 232 widget()->set_focus_on_creation(create_params.focused); |
| 233 #if defined(OS_CHROMEOS) | |
| 234 if (extension_misc::IsImeMenuExtensionId(app_window()->extension_id())) { | |
| 235 if (widget()->GetNativeView()) { | |
| 236 widget()->GetNativeView()->SetProperty(aura::client::kExcludeFromMruKey, | |
|
sky
2016/12/12 16:06:55
Can kExcludeFromMruKey be removed now?
Azure Wei
2016/12/13 11:20:47
Removed.
| |
| 237 true); | |
| 238 } | |
| 239 } | |
| 240 #endif | |
| 241 } | 233 } |
| 242 | 234 |
| 243 views::NonClientFrameView* | 235 views::NonClientFrameView* |
| 244 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() { | 236 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() { |
| 245 return views::WidgetDelegateView::CreateNonClientFrameView(widget()); | 237 return views::WidgetDelegateView::CreateNonClientFrameView(widget()); |
| 246 } | 238 } |
| 247 | 239 |
| 248 // ui::BaseWindow implementation. | 240 // ui::BaseWindow implementation. |
| 249 | 241 |
| 250 gfx::Rect ChromeNativeAppWindowViews::GetRestoredBounds() const { | 242 gfx::Rect ChromeNativeAppWindowViews::GetRestoredBounds() const { |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 InitializePanelWindow(create_params); | 376 InitializePanelWindow(create_params); |
| 385 } else { | 377 } else { |
| 386 InitializeDefaultWindow(create_params); | 378 InitializeDefaultWindow(create_params); |
| 387 } | 379 } |
| 388 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( | 380 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( |
| 389 Profile::FromBrowserContext(app_window->browser_context()), | 381 Profile::FromBrowserContext(app_window->browser_context()), |
| 390 widget()->GetFocusManager(), | 382 widget()->GetFocusManager(), |
| 391 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, | 383 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, |
| 392 NULL)); | 384 NULL)); |
| 393 } | 385 } |
| OLD | NEW |