OLD | NEW |
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/app_list/app_list_view_delegate.h" | 5 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "apps/custom_launcher_page_contents.h" | 9 #include "apps/custom_launcher_page_contents.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 return NULL; | 684 return NULL; |
685 | 685 |
686 content::WebContents* web_contents = service->GetStartPageContents(); | 686 content::WebContents* web_contents = service->GetStartPageContents(); |
687 if (!web_contents) | 687 if (!web_contents) |
688 return NULL; | 688 return NULL; |
689 | 689 |
690 DCHECK_EQ(profile_, web_contents->GetBrowserContext()); | 690 DCHECK_EQ(profile_, web_contents->GetBrowserContext()); |
691 views::WebView* web_view = new views::WebView( | 691 views::WebView* web_view = new views::WebView( |
692 web_contents->GetBrowserContext()); | 692 web_contents->GetBrowserContext()); |
693 web_view->SetPreferredSize(size); | 693 web_view->SetPreferredSize(size); |
| 694 web_view->SetResizeBackgroundColor(SK_ColorTRANSPARENT); |
694 web_view->SetWebContents(web_contents); | 695 web_view->SetWebContents(web_contents); |
695 return web_view; | 696 return web_view; |
696 } | 697 } |
697 | 698 |
698 std::vector<views::View*> AppListViewDelegate::CreateCustomPageWebViews( | 699 std::vector<views::View*> AppListViewDelegate::CreateCustomPageWebViews( |
699 const gfx::Size& size) { | 700 const gfx::Size& size) { |
700 std::vector<views::View*> web_views; | 701 std::vector<views::View*> web_views; |
701 | 702 |
702 for (ScopedVector<apps::CustomLauncherPageContents>::const_iterator it = | 703 for (ScopedVector<apps::CustomLauncherPageContents>::const_iterator it = |
703 custom_page_contents_.begin(); | 704 custom_page_contents_.begin(); |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
795 | 796 |
796 // SigninManagerFactory is not a leaky singleton (unlike this class), and | 797 // SigninManagerFactory is not a leaky singleton (unlike this class), and |
797 // its destructor will check that it has no remaining observers. | 798 // its destructor will check that it has no remaining observers. |
798 scoped_observer_.RemoveAll(); | 799 scoped_observer_.RemoveAll(); |
799 SigninManagerFactory::GetInstance()->RemoveObserver(this); | 800 SigninManagerFactory::GetInstance()->RemoveObserver(this); |
800 break; | 801 break; |
801 default: | 802 default: |
802 NOTREACHED(); | 803 NOTREACHED(); |
803 } | 804 } |
804 } | 805 } |
OLD | NEW |