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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Issue 1053303003: [MacViews] Implement colored window frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed a few things. Created 5 years, 7 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
OLDNEW
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 "apps/ui/views/app_window_frame_view.h" 7 #include "apps/ui/views/app_window_frame_view.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/app_mode/app_mode_utils.h" 9 #include "chrome/browser/app_mode/app_mode_utils.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 OnBeforePanelWidgetInit(use_default_bounds, &params, widget()); 225 OnBeforePanelWidgetInit(use_default_bounds, &params, widget());
226 widget()->Init(params); 226 widget()->Init(params);
227 widget()->set_focus_on_creation(create_params.focused); 227 widget()->set_focus_on_creation(create_params.focused);
228 } 228 }
229 229
230 views::NonClientFrameView* 230 views::NonClientFrameView*
231 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() { 231 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() {
232 return views::WidgetDelegateView::CreateNonClientFrameView(widget()); 232 return views::WidgetDelegateView::CreateNonClientFrameView(widget());
233 } 233 }
234 234
235 apps::AppWindowFrameView* 235 views::NonClientFrameView*
236 ChromeNativeAppWindowViews::CreateNonStandardAppFrame() { 236 ChromeNativeAppWindowViews::CreateNonStandardAppFrame() {
237 apps::AppWindowFrameView* frame = 237 apps::AppWindowFrameView* frame =
238 new apps::AppWindowFrameView(widget(), this, has_frame_color_, 238 new apps::AppWindowFrameView(widget(), this, has_frame_color_,
239 active_frame_color_, inactive_frame_color_); 239 active_frame_color_, inactive_frame_color_);
240 frame->Init(); 240 frame->Init();
241 return frame; 241 return frame;
242 } 242 }
243 243
244 // ui::BaseWindow implementation. 244 // ui::BaseWindow implementation.
245 245
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 InitializePanelWindow(create_params); 393 InitializePanelWindow(create_params);
394 } else { 394 } else {
395 InitializeDefaultWindow(create_params); 395 InitializeDefaultWindow(create_params);
396 } 396 }
397 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( 397 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
398 Profile::FromBrowserContext(app_window->browser_context()), 398 Profile::FromBrowserContext(app_window->browser_context()),
399 widget()->GetFocusManager(), 399 widget()->GetFocusManager(),
400 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, 400 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
401 NULL)); 401 NULL));
402 } 402 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698