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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 8678015: Touch constants and dead code removal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 "chrome/browser/ui/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1931 matching lines...) Expand 10 before | Expand all | Expand 10 after
1942 contents_view = sidebar_split_; 1942 contents_view = sidebar_split_;
1943 1943
1944 contents_split_ = new views::SingleSplitView( 1944 contents_split_ = new views::SingleSplitView(
1945 contents_view, 1945 contents_view,
1946 devtools_container_, 1946 devtools_container_,
1947 views::SingleSplitView::VERTICAL_SPLIT, 1947 views::SingleSplitView::VERTICAL_SPLIT,
1948 this); 1948 this);
1949 contents_split_->set_id(VIEW_ID_CONTENTS_SPLIT); 1949 contents_split_->set_id(VIEW_ID_CONTENTS_SPLIT);
1950 contents_split_->SetAccessibleName( 1950 contents_split_->SetAccessibleName(
1951 l10n_util::GetStringUTF16(IDS_ACCNAME_WEB_CONTENTS)); 1951 l10n_util::GetStringUTF16(IDS_ACCNAME_WEB_CONTENTS));
1952 #if !defined(TOUCH_UI)
1953 // In TOUCH_UI we paint the background in native_tab_contents_view.
1954 contents_split_->set_background( 1952 contents_split_->set_background(
1955 views::Background::CreateSolidBackground(bg_color)); 1953 views::Background::CreateSolidBackground(bg_color));
1956 #endif
1957 AddChildView(contents_split_); 1954 AddChildView(contents_split_);
1958 set_contents_view(contents_split_); 1955 set_contents_view(contents_split_);
1959 1956
1960 #if defined(TOUCH_UI) 1957 #if defined(TOUCH_UI)
1961 status_bubble_.reset(new StatusBubbleTouch(contents_)); 1958 status_bubble_.reset(new StatusBubbleTouch(contents_));
1962 #else 1959 #else
1963 status_bubble_.reset(new StatusBubbleViews(contents_)); 1960 status_bubble_.reset(new StatusBubbleViews(contents_));
1964 #endif 1961 #endif
1965 1962
1966 #if defined(OS_WIN) && !defined(USE_AURA) 1963 #if defined(OS_WIN) && !defined(USE_AURA)
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
2644 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); 2641 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get());
2645 views::BubbleDelegateView::CreateBubble(bubble); 2642 views::BubbleDelegateView::CreateBubble(bubble);
2646 bubble->Show(); 2643 bubble->Show();
2647 } 2644 }
2648 2645
2649 void BrowserView::ShowAvatarBubbleFromAvatarButton() { 2646 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
2650 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); 2647 AvatarMenuButton* button = frame_->GetAvatarMenuButton();
2651 if (button) 2648 if (button)
2652 button->ShowAvatarBubble(); 2649 button->ShowAvatarBubble();
2653 } 2650 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698